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: IEC counter update

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14390 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2017-05-27 18:52:05 +00:00
parent a7c3cb948e
commit 799e2db8c3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/10_CUL_HM.pm
View File

@ -2353,10 +2353,15 @@ sub CUL_HM_Parse($$) {#########################################################
$mh{shash} = $modules{CUL_HM}{defptr}{$chId} $mh{shash} = $modules{CUL_HM}{defptr}{$chId}
if($modules{CUL_HM}{defptr}{$chId}); if($modules{CUL_HM}{defptr}{$chId});
push @evtEt,[$mh{shash},1,"energyTariff:" .(( $eUnit & 0xfe)?(-1*($eUnit >> 4)):($eUnit >> 4))]; # push @evtEt,[$mh{shash},1,"energyTariff:" .(( $eUnit & 0xfe)?(-1*($eUnit >> 4)):($eUnit >> 4))];
push @evtEt,[$mh{shash},1,"powerTariff:" .((($pUnit >> 4) & 0xfe)?(-1*($pUnit >> 4)):($pUnit >> 4))]; # push @evtEt,[$mh{shash},1,"powerTariff:" .((($pUnit >> 4) & 0xfe)?(-1*($pUnit >> 4)):($pUnit >> 4))];
push @evtEt,[$mh{shash},1,"powerUnit:" .(($pUnit ) & 0xfe)]; push @evtEt,[$mh{shash},1,"energyTariff:" .( $eUnit >> 4 )];
push @evtEt,[$mh{shash},1,"energyUnit:" .( $eUnit & 0x01)];
push @evtEt,[$mh{shash},1,"powerTariff:" .( $pUnit >> 4 )];
push @evtEt,[$mh{shash},1,"powerUnit:" .( $pUnit & 0x01)];
push @evtEt,[$mh{shash},1,"powerSign:" .(( $pUnit >> 3) & 0x01)];
push @evtEt,[$mh{shash},1,"powerIEC:" .( $pIEC )]; push @evtEt,[$mh{shash},1,"powerIEC:" .( $pIEC )];
push @evtEt,[$mh{shash},1,"energyIEC:" .( $eCnt )];
} }
elsif ($mh{mTp} eq "53" ||$mh{mTp} eq "54" ) { # Gas_EVENT_CYCLIC elsif ($mh{mTp} eq "53" ||$mh{mTp} eq "54" ) { # Gas_EVENT_CYCLIC