diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index 4d7bd7a05..abba5610a 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -2927,7 +2927,9 @@ sub _calcSummaries { my $type = $hash->{TYPE}; $minute = (int $minute) + 1; # Minute Range umsetzen auf 1 bis 60 - + + ## Vorhersagen + ################ my $next1HoursSum = { "PV" => 0, "Consumption" => 0, "Total" => 0, "ConsumpRcmd" => 0 }; my $next2HoursSum = { "PV" => 0, "Consumption" => 0, "Total" => 0, "ConsumpRcmd" => 0 }; my $next3HoursSum = { "PV" => 0, "Consumption" => 0, "Total" => 0, "ConsumpRcmd" => 0 }; @@ -3088,8 +3090,10 @@ sub saveEnergyConsumption { my $pvrl = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_PVreal", 0); my $gfeedin = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_GridFeedIn", 0); my $gcon = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_GridConsumption", 0); + my $batin = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_BatIn", 0); + my $batout = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_BatOut", 0); - my $con = $pvrl - $gfeedin + $gcon; + my $con = $pvrl - $gfeedin + $gcon - $batin + $batout; $paref->{con} = $con; $paref->{nhour} = sprintf("%02d",$chour+1); @@ -5962,16 +5966,16 @@ verfügbare Globalstrahlung ganz spezifisch in elektrische Energie umgewandelt.