From 44767a2062e1ff42a841c1130ba7bee43bd90740 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Thu, 18 Mar 2021 22:30:51 +0000 Subject: [PATCH] 76_SolarForecast.pm: contrib 0.15.1 git-svn-id: https://svn.fhem.de/fhem/trunk@24003 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SolarForecast.pm | 12 +++++++----- fhem/contrib/DS_Starter/77_SMAEM.pm | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index ae2332586..d7c836e80 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -1135,6 +1135,8 @@ sub centralTask { ### nicht mehr benötigte Readings löschen - kann später wieder raus !! deleteReadingspec ($hash, "Today_Hour.*_Consumption"); deleteReadingspec ($hash, "ThisHour_.*"); + deleteReadingspec ($hash, "Today_PV"); + deleteReadingspec ($hash, "Tomorrow_PV"); my $interval = controlParams ($name); @@ -1932,7 +1934,7 @@ sub forecastGraphic { my $pv4h = ReadingsNum ($name,"Next04Hours_PV", 0); my $pvRe = ReadingsNum ($name,"RestOfDay_PV", 0); - my $pvTo = ReadingsNum ($name,"Tomorrow_PV", 0); + my $pvTo = ReadingsNum ($name,"Tomorrow_PVforecast", 0); my $pvCu = ReadingsNum ($name,"Current_PV", 0); my $pcfa = ReadingsVal ($name,"pvCorrectionFactor_Auto", "off"); @@ -3138,10 +3140,10 @@ sub collectSummaries { $todaySum->{PV} += ReadingsNum ($name, "Today_Hour".(sprintf "%02d", $h)."_PVforecast", 0) if($h <= 23); } - push @$daref, "Next04Hours_PV:". (int $next4HoursSum->{PV})." Wh"; - push @$daref, "RestOfDay_PV:". (int $restOfDaySum->{PV}). " Wh"; - push @$daref, "Tomorrow_PV:". (int $tomorrowSum->{PV}). " Wh"; - push @$daref, "Today_PV:". (int $todaySum->{PV}). " Wh"; + push @$daref, "Next04Hours_PV:". (int $next4HoursSum->{PV})." Wh"; + push @$daref, "RestOfDay_PV:". (int $restOfDaySum->{PV}). " Wh"; + push @$daref, "Tomorrow_PVforecast:".(int $tomorrowSum->{PV}). " Wh"; + push @$daref, "Today_PVforecast:". (int $todaySum->{PV}). " Wh"; createReadingsFromArray ($hash, $daref, 1); diff --git a/fhem/contrib/DS_Starter/77_SMAEM.pm b/fhem/contrib/DS_Starter/77_SMAEM.pm index a4ad4c666..a7a1b012e 100644 --- a/fhem/contrib/DS_Starter/77_SMAEM.pm +++ b/fhem/contrib/DS_Starter/77_SMAEM.pm @@ -1,5 +1,5 @@ ################################################################################################ -# $Id: 77_SMAEM.pm 21706 2020-04-16 20:38:04Z DS_Starter $ +# $Id: 77_SMAEM.pm 23318 2020-12-08 21:10:47Z DS_Starter $ # # Copyright notice # @@ -1094,12 +1094,12 @@ sub SMAEM_setVersionInfo { if($modules{$type}{META}{x_prereqs_src} && !$hash->{HELPER}{MODMETAABSENT}) { # META-Daten sind vorhanden $modules{$type}{META}{version} = "v".$v; # Version aus META.json überschreiben, Anzeige mit {Dumper $modules{SMAPortal}{META}} - if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 77_SMAEM.pm 21706 2020-04-16 20:38:04Z DS_Starter $ im Kopf komplett! vorhanden ) + if($modules{$type}{META}{x_version}) { # {x_version} ( nur gesetzt wenn $Id: 77_SMAEM.pm 23318 2020-12-08 21:10:47Z DS_Starter $ im Kopf komplett! vorhanden ) $modules{$type}{META}{x_version} =~ s/1.1.1/$v/g; } else { $modules{$type}{META}{x_version} = $v; } - return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 77_SMAEM.pm 21706 2020-04-16 20:38:04Z DS_Starter $ im Kopf komplett! vorhanden ) + return $@ unless (FHEM::Meta::SetInternals($hash)); # FVERSION wird gesetzt ( nur gesetzt wenn $Id: 77_SMAEM.pm 23318 2020-12-08 21:10:47Z DS_Starter $ im Kopf komplett! vorhanden ) if(__PACKAGE__ eq "FHEM::$type" || __PACKAGE__ eq $type) { # es wird mit Packages gearbeitet -> Perl übliche Modulversion setzen # mit {->VERSION()} im FHEMWEB kann Modulversion abgefragt werden