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

76_SolarForecast: version 1.55.0, changes and fixes of V 1.54.7

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30179 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-08-06 20:32:29 +00:00
parent 451ea921f3
commit f132e61aad
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/76_SolarForecast.pm
View File

@@ -15165,7 +15165,8 @@ sub entryGraphic {
## Werte restliche Stunden ## Werte restliche Stunden
############################ ############################
my $back = _beamGraphicRemainingHours ($paref); my $back = _beamGraphicRemainingHours ($paref);
$paref->{maxVal} = $back->{maxVal}; # Startwert wenn kein Wert bereits via attr vorgegeben ist $paref->{maxVal} = $back->{maxVal}; # Startwert
$paref->{maxStVal} = $back->{maxStVal}; # Start Staplewert
$paref->{maxDif} = $back->{maxDif}; # für Typ diff $paref->{maxDif} = $back->{maxDif}; # für Typ diff
$paref->{minDif} = $back->{minDif}; # für Typ diff $paref->{minDif} = $back->{minDif}; # für Typ diff
@@ -15179,6 +15180,7 @@ sub entryGraphic {
$ret .= _levelSeparator ($paref); $ret .= _levelSeparator ($paref);
delete $paref->{maxVal}; # bereinigen vor nächster Ebene delete $paref->{maxVal}; # bereinigen vor nächster Ebene
delete $paref->{maxStVal};
delete $paref->{maxDif}; delete $paref->{maxDif};
delete $paref->{minDif}; delete $paref->{minDif};
delete $paref->{hfcg}; delete $paref->{hfcg};
@@ -15209,6 +15211,7 @@ sub entryGraphic {
########################### ###########################
my $back = _beamGraphicRemainingHours ($paref); my $back = _beamGraphicRemainingHours ($paref);
$paref->{maxVal} = $back->{maxVal}; # Startwert wenn kein Wert bereits via attr vorgegeben ist $paref->{maxVal} = $back->{maxVal}; # Startwert wenn kein Wert bereits via attr vorgegeben ist
$paref->{maxStVal} = $back->{maxStVal}; # Start Staplewert
$paref->{maxDif} = $back->{maxDif}; # für Typ diff $paref->{maxDif} = $back->{maxDif}; # für Typ diff
$paref->{minDif} = $back->{minDif}; # für Typ diff $paref->{minDif} = $back->{minDif}; # für Typ diff
@@ -15222,6 +15225,7 @@ sub entryGraphic {
$ret .= _levelSeparator ($paref); $ret .= _levelSeparator ($paref);
delete $paref->{maxVal}; # bereinigen vor nächster Ebene delete $paref->{maxVal}; # bereinigen vor nächster Ebene
delete $paref->{maxStVal};
delete $paref->{maxDif}; delete $paref->{maxDif};
delete $paref->{minDif}; delete $paref->{minDif};
delete $paref->{hfcg}; delete $paref->{hfcg};
@@ -15253,6 +15257,7 @@ sub entryGraphic {
########################### ###########################
my $back = _beamGraphicRemainingHours ($paref); my $back = _beamGraphicRemainingHours ($paref);
$paref->{maxVal} = $back->{maxVal}; # Startwert wenn kein Wert bereits via attr vorgegeben ist $paref->{maxVal} = $back->{maxVal}; # Startwert wenn kein Wert bereits via attr vorgegeben ist
$paref->{maxStVal} = $back->{maxStVal}; # Start Staplewert
$paref->{maxDif} = $back->{maxDif}; # für Typ diff $paref->{maxDif} = $back->{maxDif}; # für Typ diff
$paref->{minDif} = $back->{minDif}; # für Typ diff $paref->{minDif} = $back->{minDif}; # für Typ diff
@@ -15266,6 +15271,7 @@ sub entryGraphic {
$ret .= _levelSeparator ($paref); $ret .= _levelSeparator ($paref);
delete $paref->{maxVal}; # bereinigen vor nächster Ebene delete $paref->{maxVal}; # bereinigen vor nächster Ebene
delete $paref->{maxStVal};
delete $paref->{maxDif}; delete $paref->{maxDif};
delete $paref->{minDif}; delete $paref->{minDif};
delete $paref->{hfcg}; delete $paref->{hfcg};
@@ -16945,6 +16951,7 @@ sub _beamGraphicRemainingHours {
my $hash = $defs{$name}; my $hash = $defs{$name};
my $maxVal = $hfcg->{0}{beam1}; # Startwert my $maxVal = $hfcg->{0}{beam1}; # Startwert
my $maxStVal = $hfcg->{0}{beam1} + $hfcg->{0}{beam2}; # Start Staplewert
my $maxDif = $hfcg->{0}{diff}; # für Typ diff my $maxDif = $hfcg->{0}{diff}; # für Typ diff
my $minDif = $hfcg->{0}{diff}; # für Typ diff my $minDif = $hfcg->{0}{diff}; # für Typ diff
my $bcapsum = CurrentVal ($name, 'batcapsum', 0); # Summe installierte Batterie Kapazität in Wh my $bcapsum = CurrentVal ($name, 'batcapsum', 0); # Summe installierte Batterie Kapazität in Wh
@@ -17104,12 +17111,14 @@ sub _beamGraphicRemainingHours {
$maxVal = $hfcg->{$i}{beam1} if($hfcg->{$i}{beam1} > $maxVal); $maxVal = $hfcg->{$i}{beam1} if($hfcg->{$i}{beam1} > $maxVal);
$maxVal = $hfcg->{$i}{beam2} if($hfcg->{$i}{beam2} > $maxVal); $maxVal = $hfcg->{$i}{beam2} if($hfcg->{$i}{beam2} > $maxVal);
$maxStVal = $hfcg->{$i}{beam1} + $hfcg->{$i}{beam2} if($maxStVal < $hfcg->{$i}{beam1} + $hfcg->{$i}{beam2});
$maxDif = $hfcg->{$i}{diff} if($hfcg->{$i}{diff} > $maxDif); $maxDif = $hfcg->{$i}{diff} if($hfcg->{$i}{diff} > $maxDif);
$minDif = $hfcg->{$i}{diff} if($hfcg->{$i}{diff} < $minDif); $minDif = $hfcg->{$i}{diff} if($hfcg->{$i}{diff} < $minDif);
} }
my $back = { my $back = {
maxVal => $maxVal, maxVal => $maxVal,
maxStVal => $maxStVal,
maxDif => $maxDif, maxDif => $maxDif,
minDif => $minDif, minDif => $minDif,
}; };
@@ -17204,7 +17213,8 @@ sub _beamGraphic {
my $fcolor2 = $paref->{fcolor2}; my $fcolor2 = $paref->{fcolor2};
my $offset = $paref->{offset}; my $offset = $paref->{offset};
my $thishour = $paref->{thishour}; my $thishour = $paref->{thishour};
my $maxVal = $paref->{maxVal}; my $maxVal = $paref->{maxVal}; # Maximalwert von beam1 ODER beam2
my $maxStVal = $paref->{maxStVal}; # Maximalwert des Stapels beam1 UND beam2
my $maxDif = $paref->{maxDif}; my $maxDif = $paref->{maxDif};
my $minDif = $paref->{minDif}; my $minDif = $paref->{minDif};
my $beam1cont = $paref->{beam1cont}; my $beam1cont = $paref->{beam1cont};