From 83b1ce891388fa12c8b43e2cbdef6ae519ce6c91 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sat, 15 Jun 2019 06:30:43 +0000 Subject: [PATCH] 76_SMAPortal: contrib 2.3.2 git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@19627 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- contrib/DS_Starter/76_SMAPortal.pm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/DS_Starter/76_SMAPortal.pm b/contrib/DS_Starter/76_SMAPortal.pm index d03755e11..c7f4dfdfd 100644 --- a/contrib/DS_Starter/76_SMAPortal.pm +++ b/contrib/DS_Starter/76_SMAPortal.pm @@ -1543,8 +1543,8 @@ sub extractConsumerHistData($$$) { $consumers{"${i}_ConsumerOid"} = $c->{'ConsumerOid'}; $consumers{"${i}_ConsumerLfd"} = $i; my $cpower = $c->{'TotalEnergy'}{'Measurement'}; # Energieverbrauch im Timeframe in Wh - my $bdc = $c->{'BatteryDischarging'}; # Batterieentladung in ? - my $bc = $c->{'BatteryCharging'}; # Batterieladung in ? + my $bdc = $c->{'BatteryDischarging'}; # Batterieentladung in Wh + my $bc = $c->{'BatteryCharging'}; # Batterieladung in Wh my $cn = $consumers{"${i}_ConsumerName"}; # Verbrauchername $cn = substUmlauts($cn); @@ -1561,12 +1561,12 @@ sub extractConsumerHistData($$$) { readingsBulkUpdate($hash, "L3_${cn}_EnergyTotalDay", sprintf("%.0f", $cpower)." Wh") if(defined($cpower) && $tf eq "day"); readingsBulkUpdate($hash, "L3_${cn}_EnergyTotalMonth", sprintf("%.0f", $cpower)." Wh") if(defined($cpower) && $tf eq "month"); readingsBulkUpdate($hash, "L3_${cn}_EnergyTotalYear", sprintf("%.0f", $cpower)." Wh") if(defined($cpower) && $tf eq "year"); - readingsBulkUpdate($hash, "L3_BatteryDischargingDay", sprintf("%.0f", $bdc) ) if(defined($bdc) && $tf eq "day"); - readingsBulkUpdate($hash, "L3_BatteryDischargingMonth", sprintf("%.0f", $bdc) ) if(defined($bdc) && $tf eq "month"); - readingsBulkUpdate($hash, "L3_BatteryDischargingYear", sprintf("%.0f", $bdc) ) if(defined($bdc) && $tf eq "year"); - readingsBulkUpdate($hash, "L3_BatteryChargingDay", sprintf("%.0f", $bc) ) if(defined($bc) && $tf eq "day"); - readingsBulkUpdate($hash, "L3_BatteryChargingMonth", sprintf("%.0f", $bc) ) if(defined($bc) && $tf eq "month"); - readingsBulkUpdate($hash, "L3_BatteryChargingYear", sprintf("%.0f", $bc) ) if(defined($bc) && $tf eq "year"); + readingsBulkUpdate($hash, "L3_BatteryDischargingDay", sprintf("%.0f", $bdc) ." Wh") if(defined($bdc) && $tf eq "day"); + readingsBulkUpdate($hash, "L3_BatteryDischargingMonth", sprintf("%.0f", $bdc) ." Wh") if(defined($bdc) && $tf eq "month"); + readingsBulkUpdate($hash, "L3_BatteryDischargingYear", sprintf("%.0f", $bdc) ." Wh") if(defined($bdc) && $tf eq "year"); + readingsBulkUpdate($hash, "L3_BatteryChargingDay", sprintf("%.0f", $bc) ." Wh") if(defined($bc) && $tf eq "day"); + readingsBulkUpdate($hash, "L3_BatteryChargingMonth", sprintf("%.0f", $bc) ." Wh") if(defined($bc) && $tf eq "month"); + readingsBulkUpdate($hash, "L3_BatteryChargingYear", sprintf("%.0f", $bc) ." Wh") if(defined($bc) && $tf eq "year"); readingsBulkUpdate($hash, "L3_${cn}_EnergyRelativeMonthGrid", sprintf("%.0f", $gcr)." %") if(defined($gcr) && $tf eq "month"); readingsBulkUpdate($hash, "L3_${cn}_EnergyTotalMonthGrid", sprintf("%.0f", $gct)." Wh") if(defined($gct) && $tf eq "month");