mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

76_SMAPortal: contrib 2.3.6

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19672 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2019-06-20 19:18:53 +00:00
parent c088db2168
commit d88082475c
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/contrib/DS_Starter/76_SMAPortal.pm
View File

@@ -1537,6 +1537,7 @@ return;
sub extractConsumerHistData($$$) { sub extractConsumerHistData($$$) {
my ($hash,$chdata,$tf) = @_; my ($hash,$chdata,$tf) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my ($bdcd,$bcd);
my %consumers; my %consumers;
my ($key,$val,$i,$res,$gcr,$gct,$pcr,$pct,$tct,$bcr,$bct); my ($key,$val,$i,$res,$gcr,$gct,$pcr,$pct,$tct,$bcr,$bct);
@@ -1549,7 +1550,8 @@ sub extractConsumerHistData($$$) {
my $bataval = (defined(ReadingsNum($name,"L1_BatteryIn", undef)) || defined(ReadingsNum($name,"L1_BatteryOut", undef)))?1:0; # Identifikation ist Battery vorhanden ? my $bataval = (defined(ReadingsNum($name,"L1_BatteryIn", undef)) || defined(ReadingsNum($name,"L1_BatteryOut", undef)))?1:0; # Identifikation ist Battery vorhanden ?
my ($bdcd,$bcd) = (0,0); if($tf =~ /day/) {
($bdcd,$bcd) = (0,0);
foreach my $di (@{$chdata->{'BatteryDischarging'}}) { foreach my $di (@{$chdata->{'BatteryDischarging'}}) {
$bdcd += $di->{'Measurement'}/4; # aufsummierte Batterieentladung pro Zeiteinheit (day) in Wh $bdcd += $di->{'Measurement'}/4; # aufsummierte Batterieentladung pro Zeiteinheit (day) in Wh
} }
@@ -1557,6 +1559,7 @@ sub extractConsumerHistData($$$) {
foreach my $ch (@{$chdata->{'BatteryCharging'}}) { foreach my $ch (@{$chdata->{'BatteryCharging'}}) {
$bcd += $ch->{'Measurement'}/4; # aufsummierte Batterieladung pro Zeiteinheit (day) in Wh $bcd += $ch->{'Measurement'}/4; # aufsummierte Batterieladung pro Zeiteinheit (day) in Wh
} }
}
readingsBeginUpdate($hash); readingsBeginUpdate($hash);