FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast: contrib Test

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29579 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2025-01-26 16:40:07 +00:00
parent 55ad97e71f
commit 5bbc8c6fc8
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -709,17 +709,17 @@ my %hmoon = (
); );
my %hrepl = ( # Zeichenersetzungen my %hrepl = ( # Zeichenersetzungen
'0' => 'a', '0' => 'a',
'1' => 'b', '1' => 'b',
'2' => 'c', '2' => 'c',
'3' => 'd', '3' => 'd',
'4' => 'e', '4' => 'e',
'5' => 'f', '5' => 'f',
'6' => 'g', '6' => 'g',
'7' => 'h', '7' => 'h',
'8' => 'i', '8' => 'i',
'9' => 'j', '9' => 'j',
'.' => 'k', '\.' => 'k',
); );
my %hqtxt = ( # Hash (Setup) Texte my %hqtxt = ( # Hash (Setup) Texte
@ -4745,7 +4745,7 @@ sub _getlistPVCircular {
my $hash = $defs{$name}; my $hash = $defs{$name};
my $ret = listDataPool ($hash, 'circular', $arg); my $ret = listDataPool ($hash, 'circular', $arg);
$ret .= lineFromSpaces ($ret, -20); $ret .= lineFromSpaces ($ret, 5);
return $ret; return $ret;
} }
@ -13193,6 +13193,8 @@ sub entryGraphic {
delete $paref->{maxDif}; delete $paref->{maxDif};
delete $paref->{minDif}; delete $paref->{minDif};
Log3 ($name, 4, "$name - RET nach Ebene 1:\n".$ret);
## Balkengrafik Ebene 2 ## Balkengrafik Ebene 2
######################### #########################
if ($paref->{beam3cont} || $paref->{beam4cont}) { # Balkengrafik Ebene 2 if ($paref->{beam3cont} || $paref->{beam4cont}) { # Balkengrafik Ebene 2
@ -13231,6 +13233,8 @@ sub entryGraphic {
delete $paref->{minDif}; delete $paref->{minDif};
} }
Log3 ($name, 4, "$name - RET nach Ebene 2:\n".$ret);
$paref->{modulo}++; $paref->{modulo}++;
} }
@ -13265,6 +13269,8 @@ sub entryGraphic {
$ret .= "</td></tr>"; $ret .= "</td></tr>";
$ret .= "</table>"; $ret .= "</table>";
Log3 ($name, 4, "$name - RET nach Ebene Flowgrafik:\n".$ret);
return $ret; return $ret;
} }
@ -14851,6 +14857,7 @@ sub _beamGraphic {
my $ret = q{}; my $ret = q{};
$ret .= __weatherOnBeam ($paref) if($weather); $ret .= __weatherOnBeam ($paref) if($weather);
$ret .= __batteryOnBeam ($paref); $ret .= __batteryOnBeam ($paref);
my $m = $paref->{modulo} % 2; my $m = $paref->{modulo} % 2;
if ($show_diff eq 'top') { # Zusätzliche Zeile Ertrag - Verbrauch if ($show_diff eq 'top') { # Zusätzliche Zeile Ertrag - Verbrauch
@ -15329,7 +15336,6 @@ sub __batteryOnBeam {
$ret .= "<tr class='$htr{$m}{cl}'><td class='solarfc'></td>"; # freier Platz am Anfang $ret .= "<tr class='$htr{$m}{cl}'><td class='solarfc'></td>"; # freier Platz am Anfang
my $ii = 0; my $ii = 0;
my $m =0;
for my $i (0..($maxhours * 2) - 1) { for my $i (0..($maxhours * 2) - 1) {
my $skip = __dontNightshowSkipSync ($name, $paref, $i); my $skip = __dontNightshowSkipSync ($name, $paref, $i);
@ -15372,27 +15378,14 @@ sub __batteryOnBeam {
} }
); );
Log3 ($name, 4, "$name - Test title nach Subst $i: $title") if($m==0 || $m==1 || $m==2); $title .= defined $currsoc ? "\n".$htitles{socbacur}{$lang}.": ".$currsoc." %" : '';
my $titleadd = defined $currsoc ? "\n".$htitles{socbacur}{$lang}.": ".$currsoc." %" : '';
Log3 ($name, 4, "$name - Test title Addon $i: $titleadd") if($m==0 || $m==1 || $m==2);
$title .= $titleadd;
Log3 ($name, 4, "$name - Test title Zusammengesetzt $i: $title") if($m==0 || $m==1 || $m==2);
my $image = defined $hfcg->{$i}{'rcdchargebat'.$bn} ? FW_makeImage ($bicon) : ''; my $image = defined $hfcg->{$i}{'rcdchargebat'.$bn} ? FW_makeImage ($bicon) : '';
$ret .= "<td title='$title' class='solarfc' width='$width' style='margin:1px; vertical-align:middle align:center; padding-bottom:1px;'>$image</td>"; $ret .= "<td title='$title' class='solarfc' width='$width' style='margin:1px; vertical-align:middle align:center; padding-bottom:1px;'>$image</td>";
Log3 ($name, 4, "$name - Test Return komplett $i: $ret\n") if($m==0 || $m==1 || $m==2);
debugLog ($paref, 'graphic', "Battery $bn pos >$i< day: $day_str, time: $time_str, Power ('-' = out): ".(defined $bpower ? $bpower : 'undef'). debugLog ($paref, 'graphic', "Battery $bn pos >$i< day: $day_str, time: $time_str, Power ('-' = out): ".(defined $bpower ? $bpower : 'undef').
" W, Rcmd: ".(defined $hfcg->{$i}{'rcdchargebat'.$bn} ? $hfcg->{$i}{'rcdchargebat'.$bn} : 'undef'). " W, Rcmd: ".(defined $hfcg->{$i}{'rcdchargebat'.$bn} ? $hfcg->{$i}{'rcdchargebat'.$bn} : 'undef').
", SoC: ".(defined $hfcg->{$i}{'soc'.$bn} ? $hfcg->{$i}{'soc'.$bn} : 'undef')." %"); ", SoC: ".(defined $hfcg->{$i}{'soc'.$bn} ? $hfcg->{$i}{'soc'.$bn} : 'undef')." %");
$m++;
} }
$ret .= "<td class='solarfc'></td></tr>" if($ret); # freier Platz am Ende der Icon Zeile $ret .= "<td class='solarfc'></td></tr>" if($ret); # freier Platz am Ende der Icon Zeile