FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00
Code Issues Releases Wiki Activity

10_CUL_HM: handle power meter overflow

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8654 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-05-30 11:09:38 +00:00
parent 9e79336c35
commit 64a5ae2834
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/10_CUL_HM.pm
View File

@ -1934,6 +1934,7 @@ sub CUL_HM_Parse($$) {#########################################################
my ($eCnt,$P,$I,$U,$F) = map{hex($_)} unpack 'A6A6A4A4A2',$p;
$eCnt = ($eCnt&0x7fffff)/10; #0.0 ..838860.7 Wh
$P = $P /100; #0.0 ..167772.15 W
push @evtEt,[$shash,1,"energy:" .$eCnt];
push @evtEt,[$shash,1,"power:" .$P];
@ -1963,13 +1964,19 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$defs{$devH->{channel_02}},1,"state:$eCnt"] if ($devH->{channel_02});
push @evtEt,[$defs{$devH->{channel_03}},1,"state:$P" ] if ($devH->{channel_03});
my $el = ReadingsVal($shash->{NAME},"energy",0);# get Energy last
my $eo = ReadingsVal($shash->{NAME},"energyOffset",0);
if($eCnt == 0 && hex($mNo) < 3 ){
push @evtEt,[$devH,1,"powerOn:$tn"];
my $eo = ReadingsVal($shash->{NAME},"energy",0)+
ReadingsVal($shash->{NAME},"energyOffset",0);
$eo += $el;
push @evtEt,[$shash,1,"energyOffset:".$eo];
}
elsif($el > 800000 && $el < $eCnt ){# handle overflow
$eo += 838860.7;
push @evtEt,[$shash,1,"energyOffset:".$eo];
}
push @evtEt,[$shash,1,"energyCalc:".($eo + $eCnt)];
}
}
elsif($st eq "powerMeter") {#################################################
@ -2014,12 +2021,18 @@ sub CUL_HM_Parse($$) {#########################################################
push @evtEt,[$defs{$devH->{channel_05}},1,"state:$U" ] if ($devH->{channel_05});
push @evtEt,[$defs{$devH->{channel_06}},1,"state:$F" ] if ($devH->{channel_06});
my $el = ReadingsVal($shash->{NAME},"energy",0);# get Energy last
my $eo = ReadingsVal($shash->{NAME},"energyOffset",0);
if($eCnt == 0 && hex($mNo) < 3 ){
push @evtEt,[$devH,1,"powerOn:$tn"];
my $eo = ReadingsVal($shash->{NAME},"energy",0)+
ReadingsVal($shash->{NAME},"energyOffset",0);
$eo += $el;
push @evtEt,[$shash,1,"energyOffset:".$eo];
}
elsif($el > 800000 && $el < $eCnt ){# handle overflow
$eo += 838860.7;
push @evtEt,[$shash,1,"energyOffset:".$eo];
}
push @evtEt,[$shash,1,"energyCalc:".($eo + $eCnt)];
}
}
elsif($st eq "repeater"){ ###################################################