From 2cbb34a001d65f0cb774eef40b00819af205b23a Mon Sep 17 00:00:00 2001
From: DS_Starter <DS_Starter@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 13 Oct 2024 08:09:30 +0000
Subject: [PATCH] 76_SolarForecast: contrib 1.36.0

git-svn-id: https://svn.fhem.de/fhem/trunk@29233 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/DS_Starter/76_SolarForecast.pm | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm
index bd34ac0b0..bd3b5c308 100644
--- a/fhem/contrib/DS_Starter/76_SolarForecast.pm
+++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm
@@ -156,9 +156,9 @@ BEGIN {
 
 # Versions History intern
 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 ".
-                           "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 ".
                            "day/night new optional key 'icon' in attr setupInverterDev, resize all flowgraphic icons to a standard ".
                            "scaling, __switchConsumer: run ___setConsumerSwitchingState before switch subs ".
@@ -5711,6 +5711,8 @@ sub _attrOtherProducer {                 ## no critic "not used"
       if (!$h->{pcurr} || !$h->{etotal}) {
           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') {
       $paref->{prn} = $prn;
@@ -5718,8 +5720,6 @@ sub _attrOtherProducer {                 ## no critic "not used"
       delete $paref->{prn};
   }
 
-  delete $data{$type}{$name}{current}{'iconp'.$prn};
-
   InternalTimer (gettimeofday()+0.5, 'FHEM::SolarForecast::centralTask', [$name, 0], 0);
   InternalTimer (gettimeofday() + 2, 'FHEM::SolarForecast::createAssociatedWith', $hash, 0);
   InternalTimer (gettimeofday() + 3, 'FHEM::SolarForecast::writeCacheToFile', [$name, 'plantconfig', $plantcfg.$name], 0);   # Anlagenkonfiguration File schreiben
@@ -5789,9 +5789,15 @@ sub _attrInverterDev {                   ## no critic "not used"
       }
 
       $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') {
-      readingsDelete    ($hash, "Current_PV");
+      for my $k (keys %{$data{$type}{$name}{inverters}}) {
+          delete $data{$type}{$name}{inverters}{$k} if($k eq $in);
+      }
+      
+      readingsDelete ($hash, "Current_PV");
       undef @{$data{$type}{$name}{current}{genslidereg}};
       
       if ($in eq '01') {                                                        # wenn der letzte Inverter gelöscht wurde
@@ -5799,9 +5805,6 @@ sub _attrInverterDev {                   ## no critic "not used"
           delete $data{$type}{$name}{circular}{99}{attrInvChangedTs};
       }
   }
-  
-  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() + 2, 'FHEM::SolarForecast::createAssociatedWith', $hash, 0);
@@ -19091,7 +19094,7 @@ sub ConsumerVal {
   my $type = $hash->{TYPE};
 
   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})) {
       return  $data{$type}{$name}{consumers}{$co}{$key};
   }
@@ -19124,7 +19127,7 @@ sub InverterVal {
   my $type = $hash->{TYPE};
 
   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})) {
       return  $data{$type}{$name}{inverters}{$in}{$key};
   }