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@30521 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-11-11 16:04:50 +00:00
parent 4146c83394
commit 6c5d6fd833
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12440,7 +12440,8 @@ sub __batChargeOptTargetPower {
$bpinmax, $bpinmax,
$runwhneed, $runwhneed,
$otpMargin, $otpMargin,
$remainingSurp $remainingSurp,
$befficiency
); );
} }
@@ -12476,7 +12477,8 @@ sub __batChargeOptTargetPower {
$bpinmax, $bpinmax,
$runwhneed, $runwhneed,
$otpMargin, $otpMargin,
$remainingSurp $remainingSurp,
$befficiency
); );
$otp->{$sbn}{ratio} = sprintf ("%.2f", $ratio); $otp->{$sbn}{ratio} = sprintf ("%.2f", $ratio);
@@ -12555,14 +12557,14 @@ return ($remainingSurp, \@remaining_hods);
# Forum: https://forum.fhem.de/index.php?msg=1349579 # Forum: https://forum.fhem.de/index.php?msg=1349579
################################################################ ################################################################
sub ___batAdjustPowerByMargin { sub ___batAdjustPowerByMargin {
my ($limpower, $pinmax, $whneed, $otpMargin, $remainingSurp) = @_; my ($limpower, $pinmax, $whneed, $otpMargin, $remainingSurp, $befficiency) = @_;
my $pow; my $pow;
my $ratio = 0; my $ratio = 0;
return ($limpower, $ratio) if(!defined $whneed || $whneed <= 0); return ($limpower, $ratio) if(!defined $whneed || $whneed <= 0);
$ratio = $remainingSurp * 100 / $whneed; $ratio = $remainingSurp * 100 / ($whneed / $befficiency);
$limpower = min ($limpower, $pinmax); # limpower !> pinmax um invertierte Interpolation zu vermeiden $limpower = min ($limpower, $pinmax); # limpower !> pinmax um invertierte Interpolation zu vermeiden
if ($limpower <= 0 || !$otpMargin) {$pow = $limpower} if ($limpower <= 0 || !$otpMargin) {$pow = $limpower}