FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-28 17:12:32 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast: contrib 1.36.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29233 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-10-13 08:09:30 +00:00
parent 429749bcd1
commit aacc5d10f4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,9 +156,9 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"1.36.0" => "11.10.2024 new Getter valInverter, preparation for multiple inverters, rename setupInverterDev to setupInverterDev01 ". "1.36.0" => "13.10.2024 new Getter valInverter, preparation for multiple inverters, rename setupInverterDev to setupInverterDev01 ".
"Model DWD: dayAfterTomorrowPVforecast now available ". "Model DWD: dayAfterTomorrowPVforecast now available ".
"delete etotal from HistoryVal ", "delete etotal from HistoryVal, _flowGraphic: move PV Icon up to the producers row ",
"1.35.0" => "09.10.2024 _flowGraphic: replace inverter icon by FHEM SVG-Icon (sun/moon), sun or icon of moon phases according ". "1.35.0" => "09.10.2024 _flowGraphic: replace inverter icon by FHEM SVG-Icon (sun/moon), sun or icon of moon phases according ".
"day/night new optional key 'icon' in attr setupInverterDev, resize all flowgraphic icons to a standard ". "day/night new optional key 'icon' in attr setupInverterDev, resize all flowgraphic icons to a standard ".
"scaling, __switchConsumer: run ___setConsumerSwitchingState before switch subs ". "scaling, __switchConsumer: run ___setConsumerSwitchingState before switch subs ".
@ -5711,6 +5711,8 @@ sub _attrOtherProducer { ## no critic "not used"
if (!$h->{pcurr} || !$h->{etotal}) { if (!$h->{pcurr} || !$h->{etotal}) {
return qq{The syntax of '$aName' is not correct. Please consider the commandref.}; return qq{The syntax of '$aName' is not correct. Please consider the commandref.};
} }
delete $data{$type}{$name}{current}{'iconp'.$prn};
} }
elsif ($paref->{cmd} eq 'del') { elsif ($paref->{cmd} eq 'del') {
$paref->{prn} = $prn; $paref->{prn} = $prn;
@ -5718,8 +5720,6 @@ sub _attrOtherProducer { ## no critic "not used"
delete $paref->{prn}; delete $paref->{prn};
} }
delete $data{$type}{$name}{current}{'iconp'.$prn};
InternalTimer (gettimeofday()+0.5, 'FHEM::SolarForecast::centralTask', [$name, 0], 0); InternalTimer (gettimeofday()+0.5, 'FHEM::SolarForecast::centralTask', [$name, 0], 0);
InternalTimer (gettimeofday() + 2, 'FHEM::SolarForecast::createAssociatedWith', $hash, 0); InternalTimer (gettimeofday() + 2, 'FHEM::SolarForecast::createAssociatedWith', $hash, 0);
InternalTimer (gettimeofday() + 3, 'FHEM::SolarForecast::writeCacheToFile', [$name, 'plantconfig', $plantcfg.$name], 0); # Anlagenkonfiguration File schreiben InternalTimer (gettimeofday() + 3, 'FHEM::SolarForecast::writeCacheToFile', [$name, 'plantconfig', $plantcfg.$name], 0); # Anlagenkonfiguration File schreiben
@ -5789,8 +5789,14 @@ sub _attrInverterDev { ## no critic "not used"
} }
$data{$type}{$name}{circular}{99}{attrInvChangedTs} = int time; $data{$type}{$name}{circular}{99}{attrInvChangedTs} = int time;
delete $data{$type}{$name}{inverters}{$in}{invertercap};
delete $data{$type}{$name}{inverters}{$in}{iicon};
} }
elsif ($paref->{cmd} eq 'del') { elsif ($paref->{cmd} eq 'del') {
for my $k (keys %{$data{$type}{$name}{inverters}}) {
delete $data{$type}{$name}{inverters}{$k} if($k eq $in);
}
readingsDelete ($hash, "Current_PV"); readingsDelete ($hash, "Current_PV");
undef @{$data{$type}{$name}{current}{genslidereg}}; undef @{$data{$type}{$name}{current}{genslidereg}};
@ -5800,9 +5806,6 @@ sub _attrInverterDev { ## no critic "not used"
} }
} }
delete $data{$type}{$name}{inverters}{$in}{invertercap};
delete $data{$type}{$name}{inverters}{$in}{iicon};
InternalTimer (gettimeofday()+0.5, 'FHEM::SolarForecast::centralTask', [$name, 0], 0); InternalTimer (gettimeofday()+0.5, 'FHEM::SolarForecast::centralTask', [$name, 0], 0);
InternalTimer (gettimeofday() + 2, 'FHEM::SolarForecast::createAssociatedWith', $hash, 0); InternalTimer (gettimeofday() + 2, 'FHEM::SolarForecast::createAssociatedWith', $hash, 0);
InternalTimer (gettimeofday() + 3, 'FHEM::SolarForecast::writeCacheToFile', [$name, 'plantconfig', $plantcfg.$name], 0); # Anlagenkonfiguration File schreiben InternalTimer (gettimeofday() + 3, 'FHEM::SolarForecast::writeCacheToFile', [$name, 'plantconfig', $plantcfg.$name], 0); # Anlagenkonfiguration File schreiben
@ -19091,7 +19094,7 @@ sub ConsumerVal {
my $type = $hash->{TYPE}; my $type = $hash->{TYPE};
if (defined($data{$type}{$name}{consumers}) && if (defined($data{$type}{$name}{consumers}) &&
defined($data{$type}{$name}{consumers}{$co}{$key}) && defined($data{$type}{$name}{consumers}{$co}) &&
defined($data{$type}{$name}{consumers}{$co}{$key})) { defined($data{$type}{$name}{consumers}{$co}{$key})) {
return $data{$type}{$name}{consumers}{$co}{$key}; return $data{$type}{$name}{consumers}{$co}{$key};
} }
@ -19124,7 +19127,7 @@ sub InverterVal {
my $type = $hash->{TYPE}; my $type = $hash->{TYPE};
if (defined($data{$type}{$name}{inverters}) && if (defined($data{$type}{$name}{inverters}) &&
defined($data{$type}{$name}{inverters}{$in}{$key}) && defined($data{$type}{$name}{inverters}{$in}) &&
defined($data{$type}{$name}{inverters}{$in}{$key})) { defined($data{$type}{$name}{inverters}{$in}{$key})) {
return $data{$type}{$name}{inverters}{$in}{$key}; return $data{$type}{$name}{inverters}{$in}{$key};
} }