Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

10_CUL_HM: remove reading update for unknown devices

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8484 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-04-26 09:11:33 +00:00
parent d3c240ed21
commit d34b2ad6f8
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fhem/FHEM/10_CUL_HM.pm
View File

@ -1039,7 +1039,8 @@ sub CUL_HM_Parse($$) {#########################################################
my $chn = hex($mI[0])& 0x3f; my $chn = hex($mI[0])& 0x3f;
my $cName = CUL_HM_id2Name($src.sprintf("%02X",$chn)); my $cName = CUL_HM_id2Name($src.sprintf("%02X",$chn));
my $bCnt = hex($mI[1]); my $bCnt = hex($mI[1]);
push @evtEt,[$defs{$cName},1,"trig_aes_$dname:$aesStat:$bCnt"]; push @evtEt,[$defs{$cName},1,"trig_aes_$dname:$aesStat:$bCnt"]
if (defined $defs{$cName});
if($aesStat eq "ok" #aes ok if($aesStat eq "ok" #aes ok
&& defined $devH->{cmdStacAESPend} #commands waiting && defined $devH->{cmdStacAESPend} #commands waiting
@ -2978,24 +2979,27 @@ sub CUL_HM_updtSDTeam(@){#in: TeamName, optional caller name and its new state
sub CUL_HM_pushEvnts(){######################################################## sub CUL_HM_pushEvnts(){########################################################
#write events to Readings and collect touched devices #write events to Readings and collect touched devices
my @ent = (); my @ent = ();
@evtEt = sort {($a->[0] cmp $b->[0])|| ($a->[1] cmp $b->[1])} @evtEt; if (scalar(@evtEt) > 0){
$evtDly = 0;# switch delay trigger off @evtEt = sort {($a->[0] cmp $b->[0])|| ($a->[1] cmp $b->[1])} @evtEt;
my ($h,$x) = ("",""); $evtDly = 0;# switch delay trigger off
my @evts = (); my ($h,$x) = ("","");
foreach my $e(@evtEt){ my @evts = ();
if(scalar(@{$e} != 3)){ foreach my $e(@evtEt){
Log 2,"CUL_HM set reading invalid:".join(",",@{$e}); if(scalar(@{$e} != 3)){
next; Log 2,"CUL_HM set reading invalid:".join(",",@{$e});
next;
}
if ($h ne ${$e}[0] || $x ne ${$e}[1]){
push @ent,CUL_HM_UpdtReadBulk($h,$x,@evts);
@evts = ();
($h,$x) = (${$e}[0],${$e}[1]);
}
push @evts,${$e}[2] if (${$e}[2]);
} }
if ($h ne ${$e}[0] || $x ne ${$e}[1]){ @evtEt = ();
push @ent,CUL_HM_UpdtReadBulk($h,$x,@evts); push @ent,CUL_HM_UpdtReadBulk($h,$x,@evts);
@evts = ();
($h,$x) = (${$e}[0],${$e}[1]);
}
push @evts,${$e}[2] if (${$e}[2]);
} }
@evtEt = ();
push @ent,CUL_HM_UpdtReadBulk($h,$x,@evts);
return @ent; return @ent;
} }
@ -3722,8 +3726,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
$rName =~ s/_chn:.*//; $rName =~ s/_chn:.*//;
my $curVal = CUL_HM_getRegFromStore($rName,$addr,$list,$peerId.$peerChn); my $curVal = CUL_HM_getRegFromStore($rName,$addr,$list,$peerId.$peerChn);
if ($curVal !~ m/^(set_|)(\d+)$/){ if ($curVal !~ m/^(set_|)(\d+)$/){
return "peer required for $regName" if ($curVal =~ m/peer/); return "peer required for $regName" if ($curVal =~ m/peer/);
return "cannot calculate value. Please issue set $name getConfig first - $curVal"; return "cannot calculate value. Please issue set $name getConfig first - $curVal";
} }
; ;
$curVal = $2; # we expect one byte in int, strap 'set_' possibly $curVal = $2; # we expect one byte in int, strap 'set_' possibly