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 1.42.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29486 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2025-01-06 21:40:17 +00:00
parent 829bb72e57
commit 98395fb54e
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15665,7 +15665,7 @@ sub __substituteIcon {
} }
} }
elsif ($ptyp eq 'battery') { # Icon Batterie elsif ($ptyp eq 'battery') { # Icon Batterie
my ($ircmd, $icharge, $idischrg, $inorcmd) = split ':', BatteryVal ($hash, $pn, 'bicon', $bicondef); my ($ircmd, $icharge, $idischrg, $inorcmd) = split ':', BatteryVal ($hash, $pn, 'bicon', '');
my $soctxt = ''; my $soctxt = '';
my $pretxt = ''; my $pretxt = '';
@ -15692,8 +15692,8 @@ sub __substituteIcon {
$socicon ? $socicon : $socicon ? $socicon :
$bicondef; # nur Farbe angegeben $bicondef; # nur Farbe angegeben
$color //= $biccolrcddef; $color //= $biccolrcddef;
$pretxt = "$msg1\n".$htitles{bcharrcd}{$lang}; $pretxt = "$msg1\n".$htitles{bcharrcd}{$lang};
} }
else { # keine Ladeempfehlung else { # keine Ladeempfehlung
($icon, $color) = split '@', $inorcmd; ($icon, $color) = split '@', $inorcmd;
@ -15701,8 +15701,8 @@ sub __substituteIcon {
$socicon ? $socicon : $socicon ? $socicon :
$bicondef; # nur Farbe angegeben $bicondef; # nur Farbe angegeben
$color //= $biccolnrcddef; $color //= $biccolnrcddef;
$pretxt = "$msg1\n".$htitles{bncharcd}{$lang}; $pretxt = "$msg1\n".$htitles{bncharcd}{$lang};
} }
} }
@ -15713,8 +15713,8 @@ sub __substituteIcon {
$socicon ? $socicon : $socicon ? $socicon :
$bicondef; # nur Farbe angegeben $bicondef; # nur Farbe angegeben
$color //= $bchgiconcoldef; $color //= $bchgiconcoldef;
$txt = "$pretxt\nStatus: ".$htitles{ischawth}{$lang}.' '.$pcurr.' W'.$soctxt; $txt = "$pretxt\nStatus: ".$htitles{ischawth}{$lang}.' '.$pcurr.' W'.$soctxt;
} }
elsif ($pcurr < 0) { # Batterie wird entladen elsif ($pcurr < 0) { # Batterie wird entladen
($icon, $color) = split '@', $idischrg; ($icon, $color) = split '@', $idischrg;
@ -15722,11 +15722,17 @@ sub __substituteIcon {
$socicon ? $socicon : $socicon ? $socicon :
$bicondef; # nur Farbe angegeben $bicondef; # nur Farbe angegeben
$color //= $bdchiconcoldef; $color //= $bdchiconcoldef;
$txt = "$pretxt\nStatus: ".$htitles{isdchawt}{$lang}.' '.(abs $pcurr).' W'.$soctxt; $txt = "$pretxt\nStatus: ".$htitles{isdchawt}{$lang}.' '.(abs $pcurr).' W'.$soctxt;
} }
else { else { # Standby
$txt = "$pretxt\nStatus: Standby".$soctxt; ($icon, $color) = split '@', $ircmd;
$icon = $icon ? $icon :
$socicon ? $socicon :
$bicondef; # nur Farbe angegeben
$color //= $biccolrcddef;
$txt = "$pretxt\nStatus: Standby".$soctxt;
} }
} }
else { # zukünftiger Zeitraum (Prognose) else { # zukünftiger Zeitraum (Prognose)