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

76_SolarForecast: replace setter currentWeatherDev by attribute ctrlWeatherDev1, data maintenance

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28449 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-01-31 16:31:03 +00:00
parent a996589f95
commit 519fdcf9f0
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/76_SolarForecast.pm
View File

@ -8715,19 +8715,16 @@ sub _calcCaQcomplex {
my $chwcc = HistoryVal ($hash, $day, sprintf("%02d",$h), 'wcc', 0); # Wolkenbedeckung Heute & abgefragte Stunde
my $range = cloud2bin ($chwcc);
my ($oldfac, $oldq) = CircularAutokorrVal ($hash, sprintf("%02d",$h), $range, 0); # bisher definierter Korrekturfaktor/KF-Qualität der Stunde des Tages der entsprechenden Bewölkungsrange
$paref->{pvrl} = $pvrl;
$paref->{pvfc} = $pvfc;
$paref->{oldfac} = $oldfac;
$paref->{range} = $range;
$paref->{calc} = 'Complex';
my ($factor, $dnum) = __calcNewFactor ($paref);
my ($oldfac, $factor, $dnum) = __calcNewFactor ($paref);
delete $paref->{pvrl};
delete $paref->{pvfc};
delete $paref->{oldfac};
delete $paref->{range};
delete $paref->{calc};
@ -8776,19 +8773,15 @@ sub _calcCaQsimple {
return;
}
my ($oldfac, $oldq) = CircularAutokorrVal ($hash, sprintf("%02d",$h), 'percentile', 0);
$paref->{pvrl} = $pvrl;
$paref->{pvfc} = $pvfc;
$paref->{oldfac} = $oldfac;
$paref->{range} = 'percentile';
$paref->{calc} = 'Simple';
my ($factor, $dnum) = __calcNewFactor ($paref);
my ($oldfac, $factor, $dnum) = __calcNewFactor ($paref);
delete $paref->{pvrl};
delete $paref->{pvfc};
delete $paref->{oldfac};
delete $paref->{range};
delete $paref->{calc};
@ -8821,9 +8814,10 @@ sub __calcNewFactor {
my $factor;
my $pvrlsum = $pvrl;
my $pvfcsum = $pvfc;
$oldfac = 1 if(1 * $oldfac == 0);
my ($oldfac, $oldq) = CircularAutokorrVal ($hash, sprintf("%02d",$h), $range, 0); # bisher definierter Korrekturfaktor
my ($pvhis, $fchis, $dnum) = CircularSumVal ($hash, sprintf("%02d",$h), $range, 0);
$oldfac = 1 if(1 * $oldfac == 0);
if ($dnum) { # Werte in History vorhanden -> haben Prio !
$dnum++;
@ -8870,7 +8864,7 @@ sub __calcNewFactor {
$data{$type}{$name}{circular}{sprintf("%02d",$h)}{pvcorrf}{$range} = $factor; # Korrekturfaktor der jeweiligen Stunde als Datenquelle eintragen
$data{$type}{$name}{circular}{sprintf("%02d",$h)}{quality}{$range} = $qual;
return ($factor, $dnum);
return ($oldfac, $factor, $dnum);
}
################################################################