FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 09:55:38 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast: new consumer key exconfc

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28975 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-06-15 20:45:32 +00:00
parent 2d36cae7f4
commit 891099513d
2 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fhem/FHEM/76_SolarForecast.pm
View File

@ -10409,20 +10409,22 @@ sub _estConsumptionForecast {
my $name = $paref->{name};
my $chour = $paref->{chour};
my $t = $paref->{t};
my $day = $paref->{day}; # aktuelles Tagdatum (01...31)
my $dayname = $paref->{dayname}; # aktueller Tagname
my $day = $paref->{day}; # aktuelles Tagdatum (01...31)
my $dayname = $paref->{dayname}; # aktueller Tagname
my ($err, $medev, $h) = isDeviceValid ( { name => $name,
obj => 'setupMeterDev',
method => 'attr',
}
); # aktuelles Meter device
); # aktuelles Meter device
return if($err);
my $swdfcfc = AttrVal ($name, "affectConsForecastIdentWeekdays", 0); # nutze nur gleiche Wochentage (Mo...So) für Verbrauchsvorhersage
my $swdfcfc = AttrVal ($name, "affectConsForecastIdentWeekdays", 0); # nutze nur gleiche Wochentage (Mo...So) für Verbrauchsvorhersage
my ($am, $hm) = parseParams ($medev);
my $type = $paref->{type};
my $acref = $data{$type}{$name}{consumers};
my ($exconfc, $csme);
## Verbrauchsvorhersage für den nächsten Tag
##############################################
@ -10441,10 +10443,24 @@ sub _estConsumptionForecast {
}
my $dcon = HistoryVal ($hash, $n, 99, 'con', 0);
next if(!$dcon);
debugLog ($paref, 'consumption', "History Consumption day >$n<: $dcon");
if(!$dcon) {
debugLog ($paref, 'consumption', "Day >$n< has no registered consumption, ignore it.");
next;
}
for my $c (sort{$a<=>$b} keys %{$acref}) { # historischer Verbrauch aller registrierten Verbraucher aufaddieren
$exconfc = ConsumerVal ($hash, $c, 'exconfc', 0); # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
$csme = HistoryVal ($hash, $n, 99, "csme${c}", 0);
if ($exconfc) {
$dcon -= $csme;
debugLog ($paref, 'consumption', "Consumer '$c' values excluded from forecast calc by 'exconfc' - day: $n, csme: $csme");
}
}
debugLog ($paref, 'consumption', "History Consumption day >$n< considering possible exclusions: $dcon");
$totcon += $dcon;
$dnum++;
}
@ -10502,8 +10518,8 @@ sub _estConsumptionForecast {
next if(!$hcon);
for my $c (sort{$a<=>$b} keys %{$acref}) { # historischer Verbrauch aller registrierten Verbraucher aufaddieren
my $exconfc = ConsumerVal ($hash, $c, 'exconfc', 0); # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
my $csme = HistoryVal ($hash, $m, $nhhr, "csme${c}", 0);
$exconfc = ConsumerVal ($hash, $c, 'exconfc', 0); # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
$csme = HistoryVal ($hash, $m, $nhhr, "csme${c}", 0);
if ($exconfc) {
debugLog ($paref, 'consumption', "Consumer '$c' values excluded from forecast calc by 'exconfc' - day: $m, hour: $nhhr, csme: $csme");

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

@ -10409,20 +10409,22 @@ sub _estConsumptionForecast {
my $name = $paref->{name};
my $chour = $paref->{chour};
my $t = $paref->{t};
my $day = $paref->{day}; # aktuelles Tagdatum (01...31)
my $dayname = $paref->{dayname}; # aktueller Tagname
my $day = $paref->{day}; # aktuelles Tagdatum (01...31)
my $dayname = $paref->{dayname}; # aktueller Tagname
my ($err, $medev, $h) = isDeviceValid ( { name => $name,
obj => 'setupMeterDev',
method => 'attr',
}
); # aktuelles Meter device
); # aktuelles Meter device
return if($err);
my $swdfcfc = AttrVal ($name, "affectConsForecastIdentWeekdays", 0); # nutze nur gleiche Wochentage (Mo...So) für Verbrauchsvorhersage
my $swdfcfc = AttrVal ($name, "affectConsForecastIdentWeekdays", 0); # nutze nur gleiche Wochentage (Mo...So) für Verbrauchsvorhersage
my ($am, $hm) = parseParams ($medev);
my $type = $paref->{type};
my $acref = $data{$type}{$name}{consumers};
my ($exconfc, $csme);
## Verbrauchsvorhersage für den nächsten Tag
##############################################
@ -10441,10 +10443,24 @@ sub _estConsumptionForecast {
}
my $dcon = HistoryVal ($hash, $n, 99, 'con', 0);
next if(!$dcon);
debugLog ($paref, 'consumption', "History Consumption day >$n<: $dcon");
if(!$dcon) {
debugLog ($paref, 'consumption', "Day >$n< has no registered consumption, ignore it.");
next;
}
for my $c (sort{$a<=>$b} keys %{$acref}) { # historischer Verbrauch aller registrierten Verbraucher aufaddieren
$exconfc = ConsumerVal ($hash, $c, 'exconfc', 0); # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
$csme = HistoryVal ($hash, $n, 99, "csme${c}", 0);
if ($exconfc) {
$dcon -= $csme;
debugLog ($paref, 'consumption', "Consumer '$c' values excluded from forecast calc by 'exconfc' - day: $n, csme: $csme");
}
}
debugLog ($paref, 'consumption', "History Consumption day >$n< considering possible exclusions: $dcon");
$totcon += $dcon;
$dnum++;
}
@ -10502,8 +10518,8 @@ sub _estConsumptionForecast {
next if(!$hcon);
for my $c (sort{$a<=>$b} keys %{$acref}) { # historischer Verbrauch aller registrierten Verbraucher aufaddieren
my $exconfc = ConsumerVal ($hash, $c, 'exconfc', 0); # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
my $csme = HistoryVal ($hash, $m, $nhhr, "csme${c}", 0);
$exconfc = ConsumerVal ($hash, $c, 'exconfc', 0); # 1 -> Consumer Verbrauch von Erstelleung der Verbrauchsprognose ausschließen
$csme = HistoryVal ($hash, $m, $nhhr, "csme${c}", 0);
if ($exconfc) {
debugLog ($paref, 'consumption', "Consumer '$c' values excluded from forecast calc by 'exconfc' - day: $m, hour: $nhhr, csme: $csme");