From 4c537dd467c4f060a46c5ea2b27672653dd8cdf9 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Fri, 30 Mar 2018 09:57:56 +0000 Subject: [PATCH] 10_CUL_HM:no battery for virtual SD leader git-svn-id: https://svn.fhem.de/fhem/trunk@16519 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index ecf22ff97..496e96997 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -3578,7 +3578,7 @@ sub CUL_HM_parseSDteam(@){#handle SD team events my $trgCnt = hex(substr($p,2,2)); my $err = hex(substr($p,0,2)); push @evtEt,[$sHash,1,"teamCall:from $dName:$trgCnt"]; - push @evtEt,[$dHash,1,"battery:" .(($err&0x80) ? "low":"ok")]; + push @evtEt,[$dHash,1,"battery:" .(($err&0x80) ? "low":"ok")] if (!$dHash->{helper}{role}{vrt}); foreach (split ",",$attr{$sName}{peerIDs}){ my $tHash = CUL_HM_id2Hash($_); push @evtEt,[$tHash,1,"teamCall:from $dName:$trgCnt"]; @@ -3670,7 +3670,7 @@ sub CUL_HM_parseSDteam_2(@){#handle SD team events push @evtEt,[$_,1,"state:$sProsa"]; push @evtEt,[$_,1,"smoke_detect:$smokeSrc"]; } - push @evtEt,[$dHash,1,"battery:" .((hex($chn)&0x80) ? "low":"ok")]; + push @evtEt,[$dHash,1,"battery:" .((hex($chn)&0x80) ? "low":"ok")] if (!$dHash->{helper}{role}{vrt}); push @evtEt,[$sHash,1,"eventNo:".$No]; Log3 $sHash,5,"CUL_HM $sName sdTeam: no:$No state:$state aesNo:$aesKNo aesStr:$aesStr"; @@ -8950,7 +8950,8 @@ sub CUL_HM_storeRssi(@){ $rssiP->{avg} += ($val - $rssiP->{avg}) /$rssiP->{cnt}; } my $rssi; - foreach (keys %{$rssiP}){ +# foreach (keys %{$rssiP}){ + foreach ("cnt","min","max","avg","lst"){ my $val = $rssiP->{$_}?$rssiP->{$_}:0; $rssi .= $_.":".(int($val*100)/100)." "; }