diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index 589264c36..ab5e0ff27 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -9054,11 +9054,18 @@ sub _createSummaries { my $batin = CurrentVal ($hash, "powerbatin", 0); # aktuelle Batterieladung my $batout = CurrentVal ($hash, "powerbatout", 0); # aktuelle Batterieentladung - my $consumption = int ($pvgen - $gfeedin + $gcon - $batin + $batout); + my $othprod = 0; # Summe Otherproducer + + for my $prn (1..$maxproducer) { # V1.32.0 : Erzeugung sonstiger Producer (01..03) hinzufügen + $prn = sprintf "%02d", $prn; + $othprod += CurrentVal ($hash, 'generationp'.$prn, 0); + } + + my $consumption = int ($pvgen + $othprod - $gfeedin + $gcon - $batin + $batout); my $selfconsumption = int ($pvgen - $gfeedin - $batin); $selfconsumption = $selfconsumption < 0 ? 0 : $selfconsumption; - my $surplus = int ($pvgen - $consumption); # aktueller Überschuß + my $surplus = int ($pvgen + $othprod - $consumption); # aktueller Überschuß $surplus = 0 if($surplus < 0); # wegen Vergleich nompower vs. surplus my $selfconsumptionrate = 0; @@ -13779,6 +13786,9 @@ sub _flowGraphic { my $cgfi = ReadingsNum ($name, 'Current_GridFeedIn', 0); my $csc = ReadingsNum ($name, 'Current_SelfConsumption', 0); my $cc = CurrentVal ($hash, 'consumption', 0); + my $gp01 = CurrentVal ($hash, 'generationp01', 0); + my $gp02 = CurrentVal ($hash, 'generationp02', 0); + my $gp03 = CurrentVal ($hash, 'generationp03', 0); my $cc_dummy = $cc; my $batin = ReadingsNum ($name, 'Current_PowerBatIn', undef); my $batout = ReadingsNum ($name, 'Current_PowerBatOut', undef); @@ -19216,7 +19226,7 @@ to ensure that the system configuration is correct. aihit delivery status of the AI for the PV forecast (0-no delivery, 1-delivery) confc expected energy consumption including the shares of registered consumers - confcEx expected energy consumption without the shares of registered consumers + confcEx expected energy consumption without consumer shares with set key exconfc=1 crange calculated cloud area correff correction factor/quality used factor/- -> no quality defined @@ -21538,28 +21548,28 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden.