Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

CUL_HM: uprate tariff

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11588 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2016-06-01 19:02:45 +00:00
parent 7ac22b7e7e
commit 86435ecdfc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/00_HMLAN.pm
View File

@ -170,6 +170,7 @@ sub HMLAN_Notify(@) {##########################################################
HMLAN_Attr("set",$hash->{NAME},"logIDs",$aVal) if($aVal); HMLAN_Attr("set",$hash->{NAME},"logIDs",$aVal) if($aVal);
delete $hash->{helper}{attrPend}; delete $hash->{helper}{attrPend};
} }
HMLAN_writeAesKey($hash->{NAME});
} }
elsif ($dev->{NAME} eq $hash->{NAME}){ elsif ($dev->{NAME} eq $hash->{NAME}){
foreach (grep (m/CONNECTED$/,@{$dev->{CHANGED}})) { # connect/disconnect foreach (grep (m/CONNECTED$/,@{$dev->{CHANGED}})) { # connect/disconnect

6
fhem/FHEM/10_CUL_HM.pm
View File

@ -2174,10 +2174,8 @@ 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 >> 4) ]; push @evtEt,[$mh{shash},1,"energyTariff:" .(( $eUnit & 0xfe)?(-1*($eUnit >> 4)):($eUnit >> 4))];
push @evtEt,[$mh{shash},1,"energyUnit:" .($eUnit & 0xfe)]; push @evtEt,[$mh{shash},1,"powerTariff:" .((($pUnit >> 4) & 0xfe)?(-1*($pUnit >> 4)):($pUnit >> 4))];
push @evtEt,[$mh{shash},1,"powerTariff:" .($pUnit >> 4 )];
push @evtEt,[$mh{shash},1,"powerSign:" .(($pUnit >> 4) & 0xfe)];
push @evtEt,[$mh{shash},1,"powerUnit:" .(($pUnit ) & 0xfe)]; push @evtEt,[$mh{shash},1,"powerUnit:" .(($pUnit ) & 0xfe)];
push @evtEt,[$mh{shash},1,"powerIEC:" .($pIEC) ]; push @evtEt,[$mh{shash},1,"powerIEC:" .($pIEC) ];