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

76_SolarForecast: contrib version 1.58.3

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30299 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-09-16 09:47:23 +00:00
parent 735f5e0edb
commit e28f8cc106
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11817,7 +11817,7 @@ sub _batChargeMgmt {
############################################################### ###############################################################
my $spswh = max (0, sprintf ("%.0f", $fceff)); my $spswh = max (0, sprintf ("%.0f", $fceff));
if ($today) { # nur Heute wenn Überschuß vorliegt if ($today) { # nur Heute
$hsurp->{$hod}{hod} = $hod; $hsurp->{$hod}{hod} = $hod;
$hsurp->{$hod}{nhr} = $nhr; $hsurp->{$hod}{nhr} = $nhr;
$hsurp->{$hod}{surpls} = $surpls; # Überschuß in Wh der Stunde $hsurp->{$hod}{surpls} = $surpls; # Überschuß in Wh der Stunde
@@ -11935,10 +11935,6 @@ sub __batChargeOptTargetPower {
my $otpMargin = $hsurp->{$shod}{$sbn}{otpMargin}; my $otpMargin = $hsurp->{$shod}{$sbn}{otpMargin};
my $margin = defined $otpMargin ? $otpMargin : SFTYMARGIN_20; my $margin = defined $otpMargin ? $otpMargin : SFTYMARGIN_20;
$needraw *= 1 + ($margin / 100); # Sicherheitsaufschlag $needraw *= 1 + ($margin / 100); # Sicherheitsaufschlag
#if ($spls - $needraw > $fipl) { # Einspeiselimit berücksichtigen
# $needraw += ($spls - $needraw) - $fipl;
#}
$needraw = max (0, $needraw); $needraw = max (0, $needraw);
$hsurp->{$shod}{$sbn}{runwh} = sprintf "%.0f", $runwh; $hsurp->{$shod}{$sbn}{runwh} = sprintf "%.0f", $runwh;
@@ -11946,9 +11942,7 @@ sub __batChargeOptTargetPower {
my $pneedmin = sprintf "%.0f", $spls > $needraw ? # Mindestladeleistung bzw. Energie bei 1h (Wh) my $pneedmin = sprintf "%.0f", $spls > $needraw ? # Mindestladeleistung bzw. Energie bei 1h (Wh)
$needraw ? $needraw : $bpinreduced : $needraw ? $needraw : $bpinreduced :
$spls; $spls;
$hsurp->{$shod}{$sbn}{pneedmin} = min ($pneedmin, $hsurp->{$shod}{$sbn}{bpinmax}); # Begrenzung auf max. mögliche Batterieleistung $hsurp->{$shod}{$sbn}{pneedmin} = min ($pneedmin, $hsurp->{$shod}{$sbn}{bpinmax}); # Begrenzung auf max. mögliche Batterieleistung
#$hsurp->{$shod}{$sbn}{pneedmin} = sprintf "%.0f", ($needraw ? $needraw : $bpinreduced); # Mindestladeleistung bzw. Energie bei 1h (Wh)
my $newshod = sprintf "%02d", (int $shod + 1); my $newshod = sprintf "%02d", (int $shod + 1);
$hsurp->{$newshod}{$sbn}{fcnextwh} = $runwh + $hsurp->{$shod}{$sbn}{pneedmin} if(defined $hsurp->{$newshod}); $hsurp->{$newshod}{$sbn}{fcnextwh} = $runwh + $hsurp->{$shod}{$sbn}{pneedmin} if(defined $hsurp->{$newshod});
@@ -11995,7 +11989,7 @@ sub __batChargeOptTargetPower {
if ($paref->{debug} =~ /batteryManagement/) { if ($paref->{debug} =~ /batteryManagement/) {
my $mn = $otp->{$bn}{maxneed} // 0; my $mn = $otp->{$bn}{maxneed} // 0;
Log3 ($name, 1, "$name DEBUG> ChargeOTP - max OTP Bat $bn: $mn W, sum need: $sn Wh, number hrs: $mv, average: $avg W"); Log3 ($name, 1, "$name DEBUG> ChargeOTP - max OTP Bat $bn: $mn W, sum need: $sn Wh, number hrs: $mv, OTP-average: $avg W");
} }
} }