FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 05:16:45 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast.pm: contrib 0.26.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24124 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2021-04-02 06:37:48 +00:00
parent 0006c9ec72
commit ff7ac1d031
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"0.26.0" => "02.04.2021 rename attr maxPV to maxValBeam ",
"0.25.0" => "28.03.2021 changes regarding perlcritic, new getter valCurrent ", "0.25.0" => "28.03.2021 changes regarding perlcritic, new getter valCurrent ",
"0.24.0" => "26.03.2021 the language setting of the system is taken into account in the weather texts ". "0.24.0" => "26.03.2021 the language setting of the system is taken into account in the weather texts ".
"rename weatherColor_night to weatherColorNight, history_hour to historyHour ", "rename weatherColor_night to weatherColorNight, history_hour to historyHour ",
@ -393,7 +394,7 @@ sub Initialize {
"interval ". "interval ".
"layoutType:single,double,diff ". "layoutType:single,double,diff ".
"maxVariancePerDay ". "maxVariancePerDay ".
"maxPV ". "maxValBeam ".
"numHistDays:slider,1,1,30 ". "numHistDays:slider,1,1,30 ".
"rainFactorDamping:slider,0,1,100 ". "rainFactorDamping:slider,0,1,100 ".
"showDiff:no,top,bottom ". "showDiff:no,top,bottom ".
@ -1689,14 +1690,14 @@ sub _transferMeterValues {
my $ctuf = $ctunit =~ /^kWh$/xi ? 1000 : 1; my $ctuf = $ctunit =~ /^kWh$/xi ? 1000 : 1;
my $gctotal = ReadingsNum ($medev, $gt, 0) * $ctuf; # Bezug total (Wh) my $gctotal = ReadingsNum ($medev, $gt, 0) * $ctuf; # Bezug total (Wh)
my $cdaypast = 0; my $gcdaypast = 0;
for my $hour (0..int $chour) { # alle bisherigen Erzeugungen des Tages summieren for my $hour (0..int $chour) { # alle bisherigen Erzeugungen des Tages summieren
$cdaypast += ReadingsNum ($name, "Today_Hour".sprintf("%02d",$hour)."_GridConsumption", 0); $gcdaypast += ReadingsNum ($name, "Today_Hour".sprintf("%02d",$hour)."_GridConsumption", 0);
} }
my $do = 0; my $do = 0;
if ($cdaypast == 0) { # Management der Stundenberechnung auf Basis Totalwerte if ($gcdaypast == 0) { # Management der Stundenberechnung auf Basis Totalwerte
if (defined $hash->{HELPER}{INITCONTOTAL}) { if (defined $hash->{HELPER}{INITCONTOTAL}) {
$do = 1; $do = 1;
} }
@ -1705,16 +1706,16 @@ sub _transferMeterValues {
} }
} }
elsif (!defined $hash->{HELPER}{INITCONTOTAL}) { elsif (!defined $hash->{HELPER}{INITCONTOTAL}) {
$hash->{HELPER}{INITCONTOTAL} = $gctotal-$cdaypast-ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_GridConsumption", 0); $hash->{HELPER}{INITCONTOTAL} = $gctotal-$gcdaypast-ReadingsNum($name, "Today_Hour".sprintf("%02d",$chour+1)."_GridConsumption", 0);
} }
else { else {
$do = 1; $do = 1;
} }
if ($do) { if ($do) {
my $gctotthishour = int ($gctotal - ($cdaypast + $hash->{HELPER}{INITCONTOTAL})); my $gctotthishour = int ($gctotal - ($gcdaypast + $hash->{HELPER}{INITCONTOTAL}));
# Log3($name, 1, "$name - gctotal: $gctotal, cdaypast: $cdaypast, HELPER: $hash->{HELPER}{INITCONTOTAL}, gctotthishour: $gctotthishour "); # Log3($name, 1, "$name - gctotal: $gctotal, gcdaypast: $gcdaypast, HELPER: $hash->{HELPER}{INITCONTOTAL}, gctotthishour: $gctotthishour ");
if($gctotthishour < 0) { if($gctotthishour < 0) {
$gctotthishour = 0; $gctotthishour = 0;
@ -2011,7 +2012,7 @@ sub forecastGraphic {
my $width = AttrNum ($name, 'beamWidth', 6 ); # zu klein ist nicht problematisch my $width = AttrNum ($name, 'beamWidth', 6 ); # zu klein ist nicht problematisch
my $w = $width*$maxhours; # gesammte Breite der Ausgabe , WetterIcon braucht ca. 34px my $w = $width*$maxhours; # gesammte Breite der Ausgabe , WetterIcon braucht ca. 34px
my $fsize = AttrNum ($name, 'spaceSize', 24 ); my $fsize = AttrNum ($name, 'spaceSize', 24 );
my $maxVal = AttrNum ($name, 'maxPV', 0 ); # dyn. Anpassung der Balkenhöhe oder statisch ? my $maxVal = AttrNum ($name, 'maxValBeam', 0 ); # dyn. Anpassung der Balkenhöhe oder statisch ?
my $show_night = AttrNum ($name, 'showNight', 0 ); # alle Balken (Spalten) anzeigen ? my $show_night = AttrNum ($name, 'showNight', 0 ); # alle Balken (Spalten) anzeigen ?
my $show_diff = AttrVal ($name, 'showDiff', 'no' ); # zusätzliche Anzeige $di{} in allen Typen my $show_diff = AttrVal ($name, 'showDiff', 'no' ); # zusätzliche Anzeige $di{} in allen Typen
@ -2078,7 +2079,7 @@ sub forecastGraphic {
my $lblPvTo = "tomorrow:"; my $lblPvTo = "tomorrow:";
my $lblPvCu = "actual"; my $lblPvCu = "actual";
if(AttrVal("global", "language", "EN") eq "DE") { # Header globales Sprachschema Deutsch if($lang eq "DE") { # Header globales Sprachschema Deutsch
$lupt = "Stand:"; $lupt = "Stand:";
$autoct = "automatische Korrektur:"; $autoct = "automatische Korrektur:";
$lblPv4h = encode("utf8", "nächste&nbsp;4h:"); $lblPv4h = encode("utf8", "nächste&nbsp;4h:");
@ -2094,11 +2095,9 @@ sub forecastGraphic {
if($hdrDetail eq "all" || $hdrDetail eq "statusLink") { if($hdrDetail eq "all" || $hdrDetail eq "statusLink") {
my ($year, $month, $day, $time) = $lup =~ /(\d{4})-(\d{2})-(\d{2})\s+(.*)/x; my ($year, $month, $day, $time) = $lup =~ /(\d{4})-(\d{2})-(\d{2})\s+(.*)/x;
if(AttrVal("global","language","EN") eq "DE") {
$lup = "$day.$month.$year&nbsp;$time";
}
else {
$lup = "$year-$month-$day&nbsp;$time"; $lup = "$year-$month-$day&nbsp;$time";
if($lang eq "DE") {
$lup = "$day.$month.$year&nbsp;$time";
} }
my $cmdupdate = "\"FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=get $name data')\""; # Update Button generieren my $cmdupdate = "\"FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=get $name data')\""; # Update Button generieren
@ -2495,9 +2494,9 @@ sub forecastGraphic {
# z4 - Zahl negativer Wert + fsize # z4 - Zahl negativer Wert + fsize
my ($px_pos,$px_neg); my ($px_pos,$px_neg);
my $maxPV = 0; # ToDo: maxPV noch aus Attribut maxPV ableiten my $maxValBeam = 0; # ToDo: maxValBeam noch aus Attribut maxValBeam ableiten
if ($maxPV) { # Feste Aufteilung +/- , jeder 50 % bei maxPV = 0 if ($maxValBeam) { # Feste Aufteilung +/- , jeder 50 % bei maxValBeam = 0
$px_pos = int($height/2); $px_pos = int($height/2);
$px_neg = $height - $px_pos; # Rundungsfehler vermeiden $px_neg = $height - $px_pos; # Rundungsfehler vermeiden
} }
@ -4063,10 +4062,12 @@ werden weitere SolarForecast Devices zugeordnet.
</li> </li>
<br> <br>
<a name="maxPV"></a> <a name="maxValBeam"></a>
<li><b>maxPV &lt;0...val&gt; </b><br> <li><b>maxValBeam &lt;0...val&gt; </b><br>
Maximaler Ertrag in einer Stunde zur Berechnung der Balkenhöhe. <br> Festlegung des maximalen Betrags des primären Balkens (Stundenwert) zur Berechnung der maximalen Balkenhöhe.
(default: 0 -> dynamisch) Dadurch erfolgt eine Anpassung der zulässigen Gesamthöhe der Grafik. <br>
Wenn nicht gesetzt oder 0, erfolgt eine dynamische Anpassung. <br>
(default: 0)
</li> </li>
<br> <br>