From 86435ecdfcb678fd6565e6ec97ae83d9c27e969e Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Wed, 1 Jun 2016 19:02:45 +0000 Subject: [PATCH] CUL_HM: uprate tariff git-svn-id: https://svn.fhem.de/fhem/trunk@11588 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_HMLAN.pm | 1 + fhem/FHEM/10_CUL_HM.pm | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm index 200415907..abc0c101e 100755 --- a/fhem/FHEM/00_HMLAN.pm +++ b/fhem/FHEM/00_HMLAN.pm @@ -170,6 +170,7 @@ sub HMLAN_Notify(@) {########################################################## HMLAN_Attr("set",$hash->{NAME},"logIDs",$aVal) if($aVal); delete $hash->{helper}{attrPend}; } + HMLAN_writeAesKey($hash->{NAME}); } elsif ($dev->{NAME} eq $hash->{NAME}){ foreach (grep (m/CONNECTED$/,@{$dev->{CHANGED}})) { # connect/disconnect diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 0e2e4bc46..d08060b26 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -2174,10 +2174,8 @@ sub CUL_HM_Parse($$) {######################################################### $mh{shash} = $modules{CUL_HM}{defptr}{$chId} if($modules{CUL_HM}{defptr}{$chId}); - push @evtEt,[$mh{shash},1,"energyTariff:" .($eUnit >> 4) ]; - push @evtEt,[$mh{shash},1,"energyUnit:" .($eUnit & 0xfe)]; - push @evtEt,[$mh{shash},1,"powerTariff:" .($pUnit >> 4 )]; - push @evtEt,[$mh{shash},1,"powerSign:" .(($pUnit >> 4) & 0xfe)]; + 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) ];