FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

10_CUL_HM:no battery for virtual SD leader

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16519 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2018-03-30 09:57:56 +00:00
parent e6de024b8b
commit 4c537dd467
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_CUL_HM.pm
View File

@ -3578,7 +3578,7 @@ sub CUL_HM_parseSDteam(@){#handle SD team events
my $trgCnt = hex(substr($p,2,2)); my $trgCnt = hex(substr($p,2,2));
my $err = hex(substr($p,0,2)); my $err = hex(substr($p,0,2));
push @evtEt,[$sHash,1,"teamCall:from $dName:$trgCnt"]; 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}){ foreach (split ",",$attr{$sName}{peerIDs}){
my $tHash = CUL_HM_id2Hash($_); my $tHash = CUL_HM_id2Hash($_);
push @evtEt,[$tHash,1,"teamCall:from $dName:$trgCnt"]; 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,"state:$sProsa"];
push @evtEt,[$_,1,"smoke_detect:$smokeSrc"]; 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]; push @evtEt,[$sHash,1,"eventNo:".$No];
Log3 $sHash,5,"CUL_HM $sName sdTeam: no:$No state:$state aesNo:$aesKNo aesStr:$aesStr"; 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}; $rssiP->{avg} += ($val - $rssiP->{avg}) /$rssiP->{cnt};
} }
my $rssi; my $rssi;
foreach (keys %{$rssiP}){ # foreach (keys %{$rssiP}){
foreach ("cnt","min","max","avg","lst"){
my $val = $rssiP->{$_}?$rssiP->{$_}:0; my $val = $rssiP->{$_}?$rssiP->{$_}:0;
$rssi .= $_.":".(int($val*100)/100)." "; $rssi .= $_.":".(int($val*100)/100)." ";
} }