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

76_SolarForecast: minor code changes after v 1.60.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30478 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-11-02 21:18:17 +00:00
parent af6b8a1b0e
commit 5c9c3c2f2c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/76_SolarForecast.pm
View File

@@ -12391,9 +12391,9 @@ sub __batChargeOptTargetPower {
);
}
$pneedmin = sprintf "%.0f", $pneedmin;
$pneedmin = min ($pneedmin, $bpinmax); # Begrenzung auf max. mögliche Batterieladeleistung
$pneedmin = max ($pneedmin, 0);
$pneedmin = sprintf "%.0f", $pneedmin;
$hsurp->{$hod}{$sbn}{pneedmin} = $pneedmin;
@@ -12427,12 +12427,12 @@ sub __batChargeOptTargetPower {
if ( !$bpin && $gfeedin > $fipl ) {$inc = $gfeedin - $fipl} # Ladeleistung wenn akt. keine Bat-Ladung UND akt. Einspeisung > Einspeiselimit der Anlage
if ( $bpin && ($gfeedin - $bpin) > $fipl ) {$inc = $bpin + (($gfeedin - $bpin) - $fipl)} # Ladeleistung wenn akt. Bat-Ladung UND Einspeisung - Bat-Ladung > Einspeiselimit der Anlage
my $lowph = $csocwh <= $lowSocwh
my $limph = $csocwh <= $lowSocwh
? $bpinreduced
: $bpinmax;
$target = max ($target, $inc); # Einspeiselimit berücksichtigen
$target = min ($target, $lowph); # Begrenzung auf diverse Limits
$target = min ($target, $limph); # Begrenzung auf diverse Limits
$target = sprintf "%.0f", $target;
$otp->{$sbn}{target} = $target;
@@ -12443,12 +12443,11 @@ sub __batChargeOptTargetPower {
if ($nhr eq '00') { $diff = $otp->{$sbn}{target} / 60 * (60 - int $minute) } # aktuelle (Rest)-Stunde -> zeitgewichteter Ladungszufluß
else { $diff = min ($spls, $hsurp->{$hod}{$sbn}{pneedmin}) } # kleinster Wert aus PV-Überschuß oder Ladeleistungsbegrenzung
$diff = sprintf "%.0f", $diff;
$runwh = min ($goalwh, $runwh + $diff * $befficiency); # Endwert Prognose
$runwh = min ($goalwh, $runwh + ($diff * $befficiency)); # Endwert Prognose
$runwh = ___batClampValue ($runwh, $lowSocwh, $batoptsocwh, $batinstcap); # runwh begrenzen
$runwh = sprintf "%.0f", $runwh;
$hsurp->{$hod}{$sbn}{fcendwh} = sprintf ("%.0f", $runwh);
$hsurp->{$hod}{$sbn}{fcendwh} = $runwh;
$hsurp->{$nexthod}{$sbn}{fcnextwh} = $hsurp->{$hod}{$sbn}{fcendwh} if(defined $nextnhr); # Startwert kommende Stunde
}
}