FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-24 21:29:21 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast: version 1.47.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29734 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2025-03-07 19:48:53 +00:00
parent f807811541
commit 403a7151c1
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it
- feature: 76_SolarForecast: version 1.47.1
- bugfix: 98_vitoconnect: Adapt schedule data before sending
- feature: 76_SolarForecast: Major release 1.47.0
- feature: 76_SolarForecast: new spec. Reading key todayConsumptionForecastDay

25
fhem/FHEM/76_SolarForecast.pm
View File

@ -160,6 +160,7 @@ BEGIN {
# Versions History intern
my %vNotesIntern = (
"1.47.1" => "07.03.2025 __substituteIcon: consider Tooltip content if ctrlBatSocManagementXX is set ",
"1.47.0" => "05.03.2025 aiInit: change AI init sequence, use Random Forest with Ensemble algorithm, use Scalar::Util ".
"_beamGraphic.*: change decimal places für battery SoC, set aiDecTree: change addInstances to addInstAndTrain ".
"addInstAndTrain is generally executed non-blocking, _batChargeRecmd: use effective surplus for soc forecast, ".
@ -15630,15 +15631,15 @@ sub __batteryOnBeam {
}
my ($bicon, $title) = __substituteIcon ( { name => $name, # Icon / Status des Batterie Devices
pn => $bn,
ptyp => 'battery',
flag => $hfcg->{$i}{'rcdchargebat'.$bn},
msg1 => $balias,
soc => $soc,
pcurr => $bpower,
lang => $lang
}
);
pn => $bn,
ptyp => 'battery',
flag => $hfcg->{$i}{'rcdchargebat'.$bn},
msg1 => $balias,
soc => $soc,
pcurr => $bpower,
lang => $lang
}
);
$title .= defined $currsoc ? "\n".$htitles{socbacur}{$lang}.": ".$currsoc." %" : '';
my $image = defined $hfcg->{$i}{'rcdchargebat'.$bn} ? FW_makeImage ($bicon) : '';
@ -16420,6 +16421,8 @@ sub __substituteIcon {
$inorcmd = $inorcmd ? $inorcmd : '';
$icharge = $icharge ? $icharge : '';
$idischrg = $idischrg ? $idischrg : '';
my $cgbt = AttrVal ($name, 'ctrlBatSocManagement'.$pn, '');
if (defined $flag) { # Empfehlungszeitraum
if ($flag) { # Ladefreigabe
@ -16434,7 +16437,7 @@ sub __substituteIcon {
$pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1";
}
else { # prognostizierte Ladefreigabe
$pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1\n".$htitles{bcharrel}{$lang};
$pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1".($cgbt ? "\n".$htitles{bcharrel}{$lang} : '');
}
}
else { # keine Ladefreigabe
@ -16444,7 +16447,7 @@ sub __substituteIcon {
BICONDEF; # nur Farbe angegeben
$color //= BICCOLNRCDDEF;
$pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1\n".$htitles{bncharel}{$lang};
$pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1\n".($cgbt ? "\n".$htitles{bncharel}{$lang} : '');
}
}