diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 16520140c..909a3f911 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -2353,10 +2353,15 @@ sub CUL_HM_Parse($$) {######################################################### $mh{shash} = $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,"powerTariff:" .((($pUnit >> 4) & 0xfe)?(-1*($pUnit >> 4)):($pUnit >> 4))]; - push @evtEt,[$mh{shash},1,"powerUnit:" .(($pUnit ) & 0xfe)]; - push @evtEt,[$mh{shash},1,"powerIEC:" .($pIEC) ]; +# 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,"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,"energyIEC:" .( $eCnt )]; } elsif ($mh{mTp} eq "53" ||$mh{mTp} eq "54" ) { # Gas_EVENT_CYCLIC