From a0370ef8c0b63dbbaa6c2ff57775713c20cf61b6 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Wed, 24 Mar 2021 15:54:18 +0000 Subject: [PATCH] 76_SolarForecast.pm: contrib 0.21.0 git-svn-id: https://svn.fhem.de/fhem/trunk@24075 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SolarForecast.pm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index 8d7a26b19..49811d389 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -1351,7 +1351,7 @@ sub _additionalEvents { my $mseclog = AttrVal("global", "mseclog", 0); my $tsmsec = $mseclog ? ".000" : q{}; - my ($ts,$pvfc,$pvrl); + my ($ts,$pvfc,$pvrl,$gcon); $ts = $date." ".sprintf("%02d",$chour).":00:00".$tsmsec; @@ -1361,17 +1361,23 @@ sub _additionalEvents { $pvrl = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_PVreal", undef); __addCHANGED ($hash, "PVreal: ".$pvrl, $ts) if(defined $pvrl); + $gcon = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_GridConsumption", undef); + __addCHANGED ($hash, "Gridconsumption: ".$gcon, $ts) if(defined $gcon); + my $tlim = "00"; # bestimmte Aktionen if($chour =~ /^($tlim)$/x) { if(!exists $hash->{HELPER}{H00DONE}) { - $ts = $date." ".sprintf("%02d",24).":00:00".$tsmsec; + $ts = $date." 24:00:00".$tsmsec; - $pvfc = ReadingsNum($name, "Today_Hour".sprintf("%02d",24)."_PVforecast", undef); + $pvfc = ReadingsNum($name, "Today_Hour24_PVforecast", undef); __addCHANGED ($hash, "PVforecast: ".$pvfc, $ts) if(defined $pvfc); - $pvrl = ReadingsNum($name, "Today_Hour".sprintf("%02d",24)."_PVreal", undef); + $pvrl = ReadingsNum($name, "Today_Hour24_PVreal", undef); __addCHANGED ($hash, "PVreal: ".$pvrl, $ts) if(defined $pvrl); + $gcon = ReadingsNum($name, "Today_Hour24_GridConsumption", undef); + __addCHANGED ($hash, "Gridconsumption: ".$gcon, $ts) if(defined $gcon); + deleteReadingspec ($hash, "Today_Hour.*_GridConsumption"); deleteReadingspec ($hash, "Today_Hour.*_PV.*"); delete $hash->{HELPER}{INITETOTAL};