From 163e57dbb4bec579bdba68e40d83c76d92b23019 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Wed, 10 Aug 2022 20:00:03 +0000 Subject: [PATCH] 76_SolarForecast.pm: contrib 0.67.1 git-svn-id: https://svn.fhem.de/fhem/trunk@26302 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SolarForecast.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index bd44a8ca4..80dceb21c 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -120,6 +120,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( + "0.67.1 "=> "10.08.2022 fix warning, Forum: https://forum.fhem.de/index.php/topic,117864.msg1231050.html#msg1231050 ", "0.67.0 "=> "31.07.2022 change _gethtml, _getftui ", "0.66.0 "=> "24.07.2022 insert function calcPeaklossByTemp to calculate peak power reduction by temperature ", "0.65.8 "=> "23.07.2022 change calculation of cloud cover in calcRange function ", @@ -2986,7 +2987,9 @@ sub __calcEnergyPieces { my $hours = ceil ($mintime / 60); # Laufzeit in h my $ctote = ConsumerVal ($hash, $c, "avgenergy", undef); # gemessener durchschnittlicher Energieverbrauch pro Stunde (Wh) - $ctote //= ConsumerVal ($hash, $c, "power", 0); # alternativer nominaler Energieverbrauch in W (bzw. Wh bezogen auf 1 h) + $ctote = $ctote ? + $ctote : + ConsumerVal ($hash, $c, "power", 0); # alternativer nominaler Energieverbrauch in W (bzw. Wh bezogen auf 1 h) if (int($hef{$cotype}{f}) == 1) { # bei linearen Verbrauchertypen die nominale Leistungsangabe verwenden statt Durchschnitt $ctote = ConsumerVal ($hash, $c, "power", 0);