FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast.pm: contrib 0.36.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24252 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2021-04-14 17:12:33 +00:00
parent 163c2861e5
commit b076360511
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"0.36.1" => "14.04.2021 add dayname to pvHistory ",
"0.36.0" => "14.04.2021 add con to pvHistory, add quality info to pvCircular, new reading nextPolltime ", "0.36.0" => "14.04.2021 add con to pvHistory, add quality info to pvCircular, new reading nextPolltime ",
"0.35.0" => "12.04.2021 create additional PVforecast events - PV forecast until the end of the coming day ", "0.35.0" => "12.04.2021 create additional PVforecast events - PV forecast until the end of the coming day ",
"0.34.1" => "11.04.2021 further improvement of cloud dependent calculation autocorrection ", "0.34.1" => "11.04.2021 further improvement of cloud dependent calculation autocorrection ",
@ -1343,20 +1344,22 @@ sub centralTask {
} }
my @da; my @da;
my $t = time; # aktuelle Unix-Zeit my $t = time; # aktuelle Unix-Zeit
my $chour = strftime "%H", localtime($t); # aktuelle Stunde my $chour = strftime "%H", localtime($t); # aktuelle Stunde
my $minute = strftime "%M", localtime($t); # aktuelle Minute my $minute = strftime "%M", localtime($t); # aktuelle Minute
my $day = strftime "%d", localtime($t); # aktueller Tag my $day = strftime "%d", localtime($t); # aktueller Tag
my $dayname = strftime "%a", localtime($t); # aktueller Wochentagsname
my $params = { my $params = {
hash => $hash, hash => $hash,
name => $name, name => $name,
t => $t, t => $t,
minute => $minute, minute => $minute,
chour => $chour, chour => $chour,
day => $day, day => $day,
state => "updated", dayname => $dayname,
daref => \@da state => "updated",
daref => \@da
}; };
Log3 ($name, 4, "$name - ################################################################"); Log3 ($name, 4, "$name - ################################################################");
@ -3664,6 +3667,7 @@ sub setPVhistory {
my $t = $paref->{t}; # aktuelle Unix-Zeit my $t = $paref->{t}; # aktuelle Unix-Zeit
my $nhour = $paref->{nhour}; my $nhour = $paref->{nhour};
my $day = $paref->{day}; my $day = $paref->{day};
my $dayname = $paref->{dayname}; # aktueller Wochentagsname
my $histname = $paref->{histname} // qq{}; my $histname = $paref->{histname} // qq{};
my $ethishour = $paref->{ethishour} // 0; my $ethishour = $paref->{ethishour} // 0;
my $calcpv = $paref->{calcpv} // 0; my $calcpv = $paref->{calcpv} // 0;
@ -3678,6 +3682,8 @@ sub setPVhistory {
my $type = $hash->{TYPE}; my $type = $hash->{TYPE};
my $val = q{}; my $val = q{};
$data{$type}{$name}{pvhist}{$day}{99}{dayname} = $dayname;
if($histname eq "pvrl") { # realer Energieertrag if($histname eq "pvrl") { # realer Energieertrag
$val = $ethishour; $val = $ethishour;
$data{$type}{$name}{pvhist}{$day}{$nhour}{pvrl} = $ethishour; $data{$type}{$name}{pvhist}{$day}{$nhour}{pvrl} = $ethishour;
@ -3793,8 +3799,14 @@ sub listDataPool {
my $wcc = HistoryVal ($hash, $day, $key, "wcc", "-"); my $wcc = HistoryVal ($hash, $day, $key, "wcc", "-");
my $wrp = HistoryVal ($hash, $day, $key, "wrp", "-"); my $wrp = HistoryVal ($hash, $day, $key, "wrp", "-");
my $pvcorrf = HistoryVal ($hash, $day, $key, "pvcorrf", "-"); my $pvcorrf = HistoryVal ($hash, $day, $key, "pvcorrf", "-");
my $dayname = HistoryVal ($hash, $day, $key, "dayname", undef);
$ret .= "\n " if($ret); $ret .= "\n " if($ret);
$ret .= $key." => pvrl: $pvrl, pvfc: $pvfc, gcon: $gcon, con: $con, gfeedin: $gfeedin, wid: $wid, wcc: $wcc, wrp: $wrp, pvcorrf: $pvcorrf"; $ret .= $key." => pvrl: $pvrl, pvfc: $pvfc, gcon: $gcon, con: $con, gfeedin: $gfeedin";
$ret .= ", wid: $wid" if($wid);
$ret .= ", wcc: $wcc" if($wcc);
$ret .= ", wrp: $wrp" if($wrp);
$ret .= ", pvcorrf: $pvcorrf" if($pvcorrf);
$ret .= ", dayname: $dayname" if($dayname);
} }
return $ret; return $ret;
}; };