From 029d58a9ae1c689e749a66cdece89f2ffec10a55 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Sat, 12 Oct 2024 10:57:00 +0000
Subject: [PATCH] 76_SolarForecast: contrib 1.36.0

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

diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm
index ab791669a..c96d16be6 100644
--- a/fhem/contrib/DS_Starter/76_SolarForecast.pm
+++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm
@@ -157,7 +157,8 @@ BEGIN {
 # Versions History intern
 my %vNotesIntern = (
   "1.36.0" => "11.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 ",
   "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 ".
@@ -15706,7 +15707,6 @@ sub listDataPool {
           my $temp    = HistoryVal ($hash, $day, $key, 'temp',      undef);
           my $pvcorrf = HistoryVal ($hash, $day, $key, 'pvcorrf',     '-');
           my $dayname = HistoryVal ($hash, $day, $key, 'dayname',   undef);
-          my $etotal  = HistoryVal ($hash, $day, $key, 'etotal',      '-');
           my $btotin  = HistoryVal ($hash, $day, $key, 'batintotal',  '-');
           my $batin   = HistoryVal ($hash, $day, $key, 'batin',       '-');
           my $btotout = HistoryVal ($hash, $day, $key, 'batouttotal', '-');
@@ -15751,7 +15751,6 @@ sub listDataPool {
 
           $ret .= "\n      " if($ret);
           $ret .= $key." => ";
-          $ret .= "etotal: $etotal, " if($key ne '99');
           $ret .= "pvfc: $pvfc, pvrl: $pvrl, pvrlvd: $pvrlvd, rad1h: $rad1h";
           $ret .= "\n            ";
           
@@ -18605,9 +18604,11 @@ return;
 #
 #    $day: Tag des Monats (01,02,...,31)
 #    $hod: Stunde des Tages (01,02,...,24,99)
-#    $key:    etotal      - totale PV Erzeugung (Wh)
-#             pvrl        - realer PV Ertrag
+#    $key:    etotaliXX   - totale PV Erzeugung (Wh) des Inverters XX
+#             pvrlXX      - realer PV Ertrag (Wh) des Inverters XX
 #             pvfc        - PV Vorhersage
+#             pprlXX 	  - Energieerzeugung des Produzenten XX 
+#             etotalpXX   - Zählerstand "Energieertrag total" (Wh) des Produzenten XX 
 #             confc       - Vorhersage Hausverbrauch (Wh)
 #             gcons       - realer Netzbezug
 #             gfeedin     - reale Netzeinspeisung
@@ -20086,6 +20087,26 @@ to ensure that the system configuration is correct.
     </li>
     </ul>
     <br>
+    
+    <ul>
+      <a id="SolarForecast-get-valInverter"></a>
+      <li><b>valInverter </b> <br><br>
+      Shows the operating values determined for the selected inverter or all defined inverters.  <br><br>
+
+      <ul>
+         <table>
+         <colgroup> <col width="20%"> <col width="80%"> </colgroup>
+            <tr><td> <b>ietotal </b>        </td><td>total energy generated by the inverter to date (Wh)              </td></tr>
+            <tr><td> <b>igeneration </b>    </td><td>current PV generation (W)                                        </td></tr>
+            <tr><td> <b>iicon </b>          </td><td>any icons defined for displaying the device in the graphic       </td></tr>
+            <tr><td> <b>iname </b>          </td><td>name of the device                                               </td></tr>
+            <tr><td> <b>invertercap </b>    </td><td>the nominal power (W) of the inverter (if defined)               </td></tr>
+		 </table>
+      </ul>
+
+      </li>
+    </ul>
+    <br>
 
   </ul>
   <br>
@@ -22438,6 +22459,26 @@ die ordnungsgemäße Anlagenkonfiguration geprüft werden.
     </li>
     </ul>
     <br>
+    
+    <ul>
+      <a id="SolarForecast-get-valInverter"></a>
+      <li><b>valInverter </b> <br><br>
+      Zeigt die ermittelten Betriebswerte des ausgewählten Wechselrichters oder aller definierten Wechselrichter.  <br><br>
+
+      <ul>
+         <table>
+         <colgroup> <col width="20%"> <col width="80%"> </colgroup>
+            <tr><td> <b>ietotal </b>        </td><td>Stand gesamte bisher erzeugte Energie des Wechselrichters (Wh)              </td></tr>
+            <tr><td> <b>igeneration </b>    </td><td>aktuelle PV Erzeugung (W)                                                   </td></tr>
+            <tr><td> <b>iicon </b>          </td><td>die evtl. festgelegten Icons zur Darstellung des Gerätes in der Grafik      </td></tr>
+            <tr><td> <b>iname </b>          </td><td>Name des Devices                                                            </td></tr>
+            <tr><td> <b>invertercap </b>    </td><td>die nominale Leistung (W) des Wechselrichters (falls definiert)             </td></tr>
+		 </table>
+      </ul>
+
+      </li>
+    </ul>
+    <br>
 
   </ul>
   <br>