FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

bugs

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6069 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-06-05 14:21:43 +00:00
parent 477700bab0
commit 09010cada1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/00_HMLAN.pm
View File

@ -149,7 +149,9 @@ sub HMLAN_RemoveHMPair($) {####################################################
my($in ) = shift;
my(undef,$name) = split(':',$in);
my $hash = $defs{$name};
RemoveInternalTimer("hmPairForSec:$name");
delete($hash->{hmPair});
delete($hash->{hmPairSerial});
}
sub HMLAN_Notify(@) {##########################################################
my ($hash,$dev) = @_;
@ -217,8 +219,8 @@ sub HMLAN_Attr(@) {############################################################
}
elsif($aName eq "hmId"){
if ($cmd eq "set"){
my $owner = InternalVal($name,"owner_CCU",undef);
return "device owned by $owner" if ($owner);
my $owner_ccu = InternalVal($name,"owner_CCU",undef);
return "device owned by $owner_ccu" if ($owner_ccu);
return "wrong syntax: hmId must be 6-digit-hex-code (3 byte)"
if ($aVal !~ m/^[A-F0-9]{6}$/i);
}
@ -334,19 +336,23 @@ sub HMLAN_Set($@) {############################################################
if($type eq "hmPairForSec") { ####################################
return "Usage: set $name hmPairForSec <seconds_active>"
if(!$arg || $arg !~ m/^\d+$/);
HMLAN_RemoveHMPair("hmPairForSec:$name");
$hash->{hmPair} = 1;
InternalTimer(gettimeofday()+$arg, "HMLAN_RemoveHMPair", "hmPairForSec:".$name, 1);
InternalTimer(gettimeofday()+$arg, "HMLAN_RemoveHMPair", "hmPairForSec:$name", 1);
}
elsif($type eq "hmPairSerial") { ################################
return "Usage: set $name hmPairSerial <10-character-serialnumber>"
if(!$arg || $arg !~ m/^.{10}$/);
my $id = AttrVal($hash->{NAME}, "hmId", "123456");
my $id = InternalVal($hash->{NAME}, "owner", "123456");
$hash->{HM_CMDNR} = $hash->{HM_CMDNR} ? ($hash->{HM_CMDNR}+1)%256 : 1;
HMLAN_Write($hash, undef, sprintf("As15%02X8401%s000000010A%s",
$hash->{HM_CMDNR}, $id, unpack('H*', $arg)));
HMLAN_RemoveHMPair("hmPairForSec:$name");
$hash->{hmPair} = 1;
$hash->{hmPairSerial} = $arg;
InternalTimer(gettimeofday()+20, "HMLAN_RemoveHMPair", "hmPairForSec:".$name, 1);
}
return ("",1);# no not generate trigger outof command
}

3
fhem/FHEM/10_CUL_HM.pm
View File

@ -6423,7 +6423,9 @@ sub CUL_HM_storeRssi(@){
}
sub CUL_HM_UpdtCentral($){
my $name = shift;
return if(!$init_done);
my $id = CUL_HM_name2Id($name);
delete $defs{$_}{owner_CCU} # remove assignments in IO dev to this CCU
foreach (grep !/^$/,
map{InternalVal($_,"owner_CCU","") eq $name ? $_ : ""}
@ -6453,6 +6455,7 @@ sub CUL_HM_UpdtCentral($){
# --- search for peers to CCU and potentially device this channel
foreach my $ccuBId (CUL_HM_noDup(grep /$id/ ,map{split ",",AttrVal($_,"peerIDs","")}keys %defs)){
next if (length($ccuBId) !=8);
my $btnS = substr($ccuBId,6,2);
my $btn = hex($btnS) + 0;
next if (!$btn);