mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

76_SolarForecast: contrib Version 1.60.4

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30518 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-11-10 17:55:54 +00:00
parent 099b08996e
commit d6f2f56354
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11999,20 +11999,6 @@ sub _batChargeMgmt {
my $confc = NexthoursVal ($name, 'NextHour'.$nhr, 'confc', 0);
my $pvfc = NexthoursVal ($name, 'NextHour'.$nhr, 'pvfc', 0);
## Summe Verbrauch der Stunden mit PV-Erzeugung am kommenden Tag
################################################################## # V 1.60.4
if ($fd == 1 && $bn == 1) { # nur für die 1. Bat -> Performance
if ($fh == 0) {
delete $data{$name}{current}{tomorrowConsHoursWithPVGen}; # alte Summe bereinigen
}
else {
if ($pvfc) {
my $confwou = $confc * (100 - $wou) / 100; # Gewichtung Prognose-Verbrauch als Anteil "Eigennutzung" (https://forum.fhem.de/index.php?msg=1348429)
$data{$name}{current}{tomorrowConsHoursWithPVGen} += $confwou;
}
}
}
if ($fd == 2 && $fh == 0) {
$tompvfc = CurrentVal ($name, 'dayAfterTomorrowPVfc', 0); # PV Prognose übernächster Tag
$tomconfc = CurrentVal ($name, 'dayAfterTomorrowConfc', 0); # Verbrauchsprognose übernächster Tag
@@ -12904,6 +12890,9 @@ sub _createSummaries {
$restOfDaySum->{Consumption} = $hour00confcremain;
for my $h (1..MAXNEXTHOURS) {
my ($fd, $fh) = calcDayHourMove ($chour, $h);
next if($fd > 2);
my $idx = sprintf "%02d", $h;
my $pvfc = NexthoursVal ($name, "NextHour".$idx, 'pvfc', 0);
my $confc = NexthoursVal ($name, "NextHour".$idx, 'confc', 0);
@@ -12958,6 +12947,19 @@ sub _createSummaries {
$daftertomSum->{PV} += $pvfc;
$daftertomSum->{Consumption} += $confc;
}
## Summe Verbrauch der Stunden mit PV-Erzeugung am kommenden Tag
################################################################## # V 1.60.4
if ($fd == 1) { # für den nächsten Tag
if ($fh == 0) {
delete $data{$name}{current}{tomorrowConsHoursWithPVGen}; # alte Summe bereinigen
}
else {
if ($pvfc) {
$data{$name}{current}{tomorrowConsHoursWithPVGen} += $confc;
}
}
}
}
for my $th (1..24) {