FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast.pm: contrib 0.27.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24131 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2021-04-02 19:58:48 +00:00
parent 641aadd40e
commit 50cfaee7f4
1 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
fhem/contrib/DS_Starter/76_SolarForecast.pm
View File

@ -117,6 +117,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"0.27.0" => "02.04.2021 additional readings ",
"0.26.0" => "02.04.2021 rename attr maxPV to maxValBeam, bugfix in _additionalEvents ", "0.26.0" => "02.04.2021 rename attr maxPV to maxValBeam, bugfix in _additionalEvents ",
"0.25.0" => "28.03.2021 changes regarding perlcritic, new getter valCurrent ", "0.25.0" => "28.03.2021 changes regarding perlcritic, new getter valCurrent ",
"0.24.0" => "26.03.2021 the language setting of the system is taken into account in the weather texts ". "0.24.0" => "26.03.2021 the language setting of the system is taken into account in the weather texts ".
@ -1154,7 +1155,7 @@ sub centralTask {
deleteReadingspec ($hash, "ThisHour_.*"); deleteReadingspec ($hash, "ThisHour_.*");
deleteReadingspec ($hash, "Today_PV"); deleteReadingspec ($hash, "Today_PV");
deleteReadingspec ($hash, "Tomorrow_PV"); deleteReadingspec ($hash, "Tomorrow_PV");
deleteReadingspec ($hash, "NextHour.*"); # deleteReadingspec ($hash, "NextHour.*");
deleteReadingspec ($hash, "moduleEfficiency"); deleteReadingspec ($hash, "moduleEfficiency");
my $interval = controlParams ($name); my $interval = controlParams ($name);
@ -1357,7 +1358,7 @@ return;
} }
################################################################ ################################################################
# Zusätzliche Events für Logging generieren und # Zusätzliche Readings/ Events für Logging generieren und
# Sonderaufgaben ! # Sonderaufgaben !
################################################################ ################################################################
sub _additionalEvents { sub _additionalEvents {
@ -1365,6 +1366,7 @@ sub _additionalEvents {
my $hash = $paref->{hash}; my $hash = $paref->{hash};
my $name = $paref->{name}; my $name = $paref->{name};
my $chour = $paref->{chour}; my $chour = $paref->{chour};
my $daref = $paref->{daref};
my $t = $paref->{t}; # Epoche Zeit my $t = $paref->{t}; # Epoche Zeit
my $no_replace = 1; # Ersetzung von Events durch das Attribut eventMap verhindern my $no_replace = 1; # Ersetzung von Events durch das Attribut eventMap verhindern
@ -1372,33 +1374,41 @@ sub _additionalEvents {
my $mseclog = AttrVal("global", "mseclog", 0); my $mseclog = AttrVal("global", "mseclog", 0);
my $tsmsec = $mseclog ? ".000" : q{}; my $tsmsec = $mseclog ? ".000" : q{};
my ($ts,$pvfc,$pvrl,$gcon); my ($ts,$ts1,$pvfc,$pvrl,$gcon);
$ts = $date." ".sprintf("%02d",$chour).":00:00".$tsmsec; #$ts = $date." ".sprintf("%02d",$chour).":00:00".$tsmsec;
$ts1 = $date." ".sprintf("%02d",$chour)."<>00<>00";
$pvfc = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_PVforecast", undef); $pvfc = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_PVforecast", 0);
__addCHANGED ($hash, "PVforecast: ".$pvfc, $ts) if(defined $pvfc); push @$daref, "LastHourPVforecast:".$pvfc." Wh:".$ts1;
#__addCHANGED ($hash, "PVforecast: ".$pvfc, $ts) if(defined $pvfc);
$pvrl = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_PVreal", undef); $pvrl = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_PVreal", 0);
__addCHANGED ($hash, "PVreal: ".$pvrl, $ts) if(defined $pvrl); push @$daref, "LastHourPVreal:".$pvrl." Wh:".$ts1;
#__addCHANGED ($hash, "PVreal: ".$pvrl, $ts) if(defined $pvrl);
$gcon = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_GridConsumption", undef); $gcon = ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour)."_GridConsumption", 0);
__addCHANGED ($hash, "GridconsumptionReal: ".$gcon, $ts) if(defined $gcon); push @$daref, "LastHourGridconsumptionReal:".$gcon." Wh:".$ts1;
#__addCHANGED ($hash, "GridconsumptionReal: ".$gcon, $ts) if(defined $gcon);
my $tlim = "00"; # bestimmte Aktionen my $tlim = "00"; # bestimmte Aktionen
if($chour =~ /^($tlim)$/x) { if($chour =~ /^($tlim)$/x) {
if(!exists $hash->{HELPER}{H00DONE}) { if(!exists $hash->{HELPER}{H00DONE}) {
$date = strftime "%Y-%m-%d", localtime($t-7200); # Vortag (2 h Differenz reichen aus) $date = strftime "%Y-%m-%d", localtime($t-7200); # Vortag (2 h Differenz reichen aus)
$ts = $date." 23:59:59".$tsmsec; #$ts = $date." 23:59:59".$tsmsec;
$ts = $date." 23:59:59";
$pvfc = ReadingsNum($name, "Today_Hour24_PVforecast", undef); $pvfc = ReadingsNum($name, "Today_Hour24_PVforecast", 0);
__addCHANGED ($hash, "PVforecast: ".$pvfc, $ts) if(defined $pvfc); push @$daref, "LastHourPVforecast:".$pvfc.":".$ts1;
#__addCHANGED ($hash, "PVforecast: ".$pvfc, $ts) if(defined $pvfc);
$pvrl = ReadingsNum($name, "Today_Hour24_PVreal", undef); $pvrl = ReadingsNum($name, "Today_Hour24_PVreal", 0);
__addCHANGED ($hash, "PVreal: ".$pvrl, $ts) if(defined $pvrl); push @$daref, "LastHourPVreal:".$pvrl.":".$ts1;
#__addCHANGED ($hash, "PVreal: ".$pvrl, $ts) if(defined $pvrl);
$gcon = ReadingsNum($name, "Today_Hour24_GridConsumption", undef); $gcon = ReadingsNum($name, "Today_Hour24_GridConsumption", 0);
__addCHANGED ($hash, "GridconsumptionReal: ".$gcon, $ts) if(defined $gcon); push @$daref, "LastHourGridconsumptionReal:".$gcon.":".$ts1;
#__addCHANGED ($hash, "GridconsumptionReal: ".$gcon, $ts) if(defined $gcon);
deleteReadingspec ($hash, "Today_Hour.*_GridConsumption"); deleteReadingspec ($hash, "Today_Hour.*_GridConsumption");
deleteReadingspec ($hash, "Today_Hour.*_PV.*"); deleteReadingspec ($hash, "Today_Hour.*_PV.*");
@ -1411,7 +1421,7 @@ sub _additionalEvents {
delete $hash->{HELPER}{H00DONE}; delete $hash->{HELPER}{H00DONE};
} }
my $ret = DoTrigger($name, undef, $no_replace); # my $ret = DoTrigger($name, undef, $no_replace);
return; return;
} }
@ -1465,11 +1475,13 @@ sub _transferDWDForecastValues {
my $calcpv = calcPVforecast ($params); # Vorhersage gewichtet kalkulieren my $calcpv = calcPVforecast ($params); # Vorhersage gewichtet kalkulieren
$time_str = "NextHour".sprintf "%02d", $num; $time_str = "NextHour".sprintf "%02d", $num;
$epoche = $t + (3600*$num); $epoche = $t + (3600*$num);
my $ta = TimeAdjust ($epoche); my ($ta,$realts) = TimeAdjust ($epoche);
#push @$daref, "${time_str}_PVforecast:".$calcpv." Wh"; my $ta1 = $realts;
$ta1 =~ s/:/<>/gx;
push @$daref, "CurrentHourPVforecast:".$calcpv." Wh:".$ta1 if($num == 0);
#push @$daref, "${time_str}_Time:" .$ta; #push @$daref, "${time_str}_Time:" .$ta;
$data{$type}{$name}{nexthours}{$time_str}{pvforecast} = $calcpv; $data{$type}{$name}{nexthours}{$time_str}{pvforecast} = $calcpv;
@ -1520,6 +1532,11 @@ sub _transferWeatherValues {
my $fc1_SunRise = ReadingsVal($fcname, "fc1_SunRise", "00:00"); # Sonnenaufgang morgen my $fc1_SunRise = ReadingsVal($fcname, "fc1_SunRise", "00:00"); # Sonnenaufgang morgen
my $fc1_SunSet = ReadingsVal($fcname, "fc1_SunSet", "00:00"); # Sonnenuntergang morgen my $fc1_SunSet = ReadingsVal($fcname, "fc1_SunSet", "00:00"); # Sonnenuntergang morgen
$fc0_SunRise =~ s/:/<>/x;
$fc0_SunSet =~ s/:/<>/x;
$fc1_SunRise =~ s/:/<>/x;
$fc1_SunSet =~ s/:/<>/x;
push @$daref, "Today_SunRise:". $fc0_SunRise; push @$daref, "Today_SunRise:". $fc0_SunRise;
push @$daref, "Today_SunSet:". $fc0_SunSet; push @$daref, "Today_SunSet:". $fc0_SunSet;
push @$daref, "Tomorrow_SunRise:".$fc1_SunRise; push @$daref, "Tomorrow_SunRise:".$fc1_SunRise;
@ -2802,16 +2819,24 @@ sub TimeAdjust {
my $epoch = shift; my $epoch = shift;
my ($lyear,$lmonth,$lday,$lhour) = (localtime($epoch))[5,4,3,2]; my ($lyear,$lmonth,$lday,$lhour) = (localtime($epoch))[5,4,3,2];
my $ts;
$lyear += 1900; # year is 1900 based $lyear += 1900; # year is 1900 based
$lmonth++; # month number is zero based $lmonth++; # month number is zero based
my ($sec,$min,$hour,$day,$mon,$year) = (localtime(time))[0,1,2,3,4,5]; # Standard f. z.B. Readingstimstamp
$year += 1900;
$mon++;
my $realts = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $year,$mon,$day,$hour,$min,$sec);
if(AttrVal("global","language","EN") eq "DE") { if(AttrVal("global","language","EN") eq "DE") {
return (sprintf("%02d.%02d.%04d %02d:%s", $lday,$lmonth,$lyear,$lhour,"00:00")); $ts = sprintf("%02d.%02d.%04d %02d:%s", $lday,$lmonth,$lyear,$lhour,"00:00");
} }
else { else {
return (sprintf("%04d-%02d-%02d %02d:%s", $lyear,$lmonth,$lday,$lhour,"00:00")); $ts = sprintf("%04d-%02d-%02d %02d:%s", $lyear,$lmonth,$lday,$lhour,"00:00");
} }
return ($ts,$realts);
} }
################################################################ ################################################################
@ -3360,8 +3385,10 @@ sub createReadingsFromArray {
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
for my $elem (@$daref) { for my $elem (@$daref) {
my ($rn,$rval) = split ":", $elem, 2; my ($rn,$rval,$ts) = split ":", $elem, 3;
readingsBulkUpdate($hash, $rn, $rval); $rval =~ s/<>/:/gx;
$ts =~ s/<>/:/gx if(defined $ts);
readingsBulkUpdate($hash, $rn, $rval, undef, $ts);
} }
readingsEndUpdate($hash, $doevt); readingsEndUpdate($hash, $doevt);