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

76_SolarForecast: Version 1.57.2

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@30197 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
DS_Starter
2025-08-15 19:46:56 +00:00
parent d3e02f8890
commit 0b3b92a638
2 changed files with 26 additions and 7 deletions
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. # 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 # Do not insert empty lines here, update check depends on it
- feature: 76_SolarForecast: Version 1.57.2
- feature: 76_SolarForecast: max Inverter set to 5, new option in - feature: 76_SolarForecast: max Inverter set to 5, new option in
Attribute graphicControl->scaleMode=X:staple Attribute graphicControl->scaleMode=X:staple
- bugfix: 72_FRITZBOX: diverse Fehler behoben - bugfix: 72_FRITZBOX: diverse Fehler behoben

32
fhem/FHEM/76_SolarForecast.pm
View File

@@ -160,6 +160,8 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"1.57.2" => "15.08.2025 _attrconsumer: The validity of the components of the key etotal is checked ".
"_transferMeterValues: modul accept meter reset > 0 at day start ",
"1.57.1" => "10.08.2025 fix warning, Forum: https://forum.fhem.de/index.php?msg=1346055 ", "1.57.1" => "10.08.2025 fix warning, Forum: https://forum.fhem.de/index.php?msg=1346055 ",
"1.57.0" => "08.08.2025 new option attr graphicControl->scaleMode=X:staple ", "1.57.0" => "08.08.2025 new option attr graphicControl->scaleMode=X:staple ",
"1.56.0" => "07.08.2025 set MAXINVERTER to 5 ", "1.56.0" => "07.08.2025 set MAXINVERTER to 5 ",
@@ -6137,11 +6139,23 @@ sub _attrconsumer { ## no critic "not used"
} }
if ($h->{power} !~ /^[0-9]+$/xs) { if ($h->{power} !~ /^[0-9]+$/xs) {
return qq{The key "power" must be specified only by numbers without decimal places}; return qq{The key 'power' must be specified only by numbers without decimal places};
}
if (exists $h->{etotal}) {
my ($rtot, $utot, $ethreshold) = split ":", $h->{etotal};
if (!$utot || $utot !~ /^(Wh|kWh)$/xs) {
return qq{The Unit of key 'etotal' must be 'Wh' or 'kWh'};
}
if (defined $ethreshold && !isNumeric ($ethreshold)) {
return qq{The optional 'Threshold' of key 'etotal' must be numeric if specified};
}
} }
if (defined $h->{exconfc} && $h->{exconfc} !~ /^[012]$/xs) { if (defined $h->{exconfc} && $h->{exconfc} !~ /^[012]$/xs) {
return qq{The key "exconfc" is not set correct. Please consider the command reference.}; return qq{The key 'exconfc' is not set correct. Please consider the command reference.};
} }
if (exists $h->{aliasshort}) { # Kurzalias if (exists $h->{aliasshort}) { # Kurzalias
@@ -10944,11 +10958,18 @@ sub _transferMeterValues {
my $idgcon = CircularVal ($hash, 99, 'initdaygcon', undef); my $idgcon = CircularVal ($hash, 99, 'initdaygcon', undef);
if (!$gctotal) { if (!$gctotal) { # Meter Reset!
$data{$name}{circular}{99}{initdaygcon} = 0; $data{$name}{circular}{99}{initdaygcon} = 0;
Log3 ($name, 3, "$name - WARNING - '$medev' - the total energy drawn from grid was reset and is registered with >0<. Check Reading '$gt'"); Log3 ($name, 3, "$name - WARNING - '$medev' - the total energy drawn from grid was reset and is registered with >0<. Check Reading '$gt'");
} }
elsif ($gcdaypast == 0) { # Management der Stundenberechnung auf Basis Totalwerte GridConsumtion elsif (!defined $idgcon) { # Initial für den Tag noch nicht angelegt
$data{$name}{circular}{99}{initdaygcon} = $gctotal - $gcdaypast - ReadingsNum ($name, "Today_Hour".sprintf("%02d",$chour+1)."_GridConsumption", 0);
}
elsif ($idgcon > $gctotal) { # Tageszähler Meter zu spät zurückgesetzt
$data{$name}{circular}{99}{initdaygcon} = 0;
Log3 ($name, 3, "$name - WARNING - '$medev' - total Grid consumption '$gctotal' is lower than the day Init value '$idgcon'. The initialization for the day was performed again.");
}
elsif ($gcdaypast == 0) { # Stundenberechnung auf Basis Totalwerte GridConsumtion
if (defined $idgcon) { if (defined $idgcon) {
$docon = 1; $docon = 1;
} }
@@ -10956,9 +10977,6 @@ sub _transferMeterValues {
$data{$name}{circular}{99}{initdaygcon} = $gctotal; $data{$name}{circular}{99}{initdaygcon} = $gctotal;
} }
} }
elsif (!defined $idgcon) {
$data{$name}{circular}{99}{initdaygcon} = $gctotal - $gcdaypast - ReadingsNum ($name, "Today_Hour".sprintf("%02d",$chour+1)."_GridConsumption", 0);
}
else { else {
$docon = 1; $docon = 1;
} }