From 4f8a2a0242dbae9fd1d6f9913dbb19c2acdec250 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Tue, 14 Sep 2021 19:48:34 +0000
Subject: [PATCH] 76_SolarForecast.pm: contrib 0.56.2

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

diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm
index 2e1621505..6f09979ee 100644
--- a/fhem/contrib/DS_Starter/76_SolarForecast.pm
+++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm
@@ -6110,18 +6110,17 @@ sub setPVhistory {
       $data{$type}{$name}{pvhist}{$day}{$nhour}{$histname} = $consumerco;  
 
       if($histname =~ /csme[0-9]+$/xs) {
-          my $sum   = 0;
-          my $hours = 0;
+          my $sum = 0;
+          
           for my $k (keys %{$data{$type}{$name}{pvhist}{$day}}) {
               next if($k eq "99");
               my $csme = HistoryVal ($hash, $day, $k, "$histname", 0);
               next if(!$csme);
               
               $sum += $csme;
-              $hours++;
           }
-          $data{$type}{$name}{pvhist}{$day}{99}{$histname}         = $sum;
-          $data{$type}{$name}{pvhist}{$day}{99}{"hours".$histname} = $hours;        
+          
+          $data{$type}{$name}{pvhist}{$day}{99}{$histname} = $sum;        
       }      
   }
   
@@ -6129,8 +6128,21 @@ sub setPVhistory {
       $data{$type}{$name}{pvhist}{$day}{99}{$histname} = $val;        
   }
   
-  if($histname =~ /minutescsm[0-9]+$/xs) {                                                         # Anzahl Tageszyklen des Verbrauchers
-      $data{$type}{$name}{pvhist}{$day}{$nhour}{$histname} = $val;        
+  if($histname =~ /minutescsm[0-9]+$/xs) {                                                         # Anzahl Aktivminuten des Verbrauchers
+      $data{$type}{$name}{pvhist}{$day}{$nhour}{$histname} = $val;
+      my $minutes = 0;
+      my $num     = substr ($histname,10,2);
+      
+      for my $k (keys %{$data{$type}{$name}{pvhist}{$day}}) {
+          next if($k eq "99");
+          my $csmm = HistoryVal ($hash, $day, $k, "$histname", 0);
+          next if(!$csmm);
+          
+          $minutes += $csmm;
+      }
+      
+      my $cycles = HistoryVal ($hash, $day, 99, "cyclescsm${num}", 0);
+      $data{$type}{$name}{pvhist}{$day}{99}{"hourscsme${num}"} = ceil ($minutes / $cycles / 60 ) if($cycles);       
   }
   
   if($histname eq "etotal") {                                                                     # etotal des Wechselrichters
@@ -7465,8 +7477,8 @@ Ein/Ausschaltzeiten sowie deren Ausführung vom SolarForecast Modul übernehmen
             <tr><td> <b>csmtXX</b>         </td><td>Summe Energieverbrauch von ConsumerXX                                       </td></tr>
             <tr><td> <b>csmeXX</b>         </td><td>Anteil der jeweiligen Stunde des Tages am Energieverbrauch von ConsumerXX   </td></tr>
             <tr><td> <b>minutescsmXX</b>   </td><td>Summe Aktivminuten in der Stunde von ConsumerXX                             </td></tr>
-            <tr><td> <b>hourscsmeXX</b>    </td><td>Summe Aktivstunden von ConsumerXX am Tag                                    </td></tr>
-            <tr><td> <b>cyclescsmXX</b>    </td><td>Anzahl aktive Zyklen von ConsumerXX am Tag                                  </td></tr>
+            <tr><td> <b>hourscsmeXX</b>    </td><td>durchschnittliche Stunden eines Aktivzyklus von ConsumerXX des Tages        </td></tr>
+            <tr><td> <b>cyclescsmXX</b>    </td><td>Anzahl aktive Zyklen von ConsumerXX des Tages                                  </td></tr>
          </table>
       </ul>
       </li>