Changeset 35 for trunk/fw_g473rct/SES/src/wh_counter.c

Timestamp:

Nov 1, 2025, 5:01:01 PM (37 hours ago)

Author:

f.jahn

Message:

 

File:

• trunk/fw_g473rct/SES/src/wh_counter.c (modified) (3 diffs)

trunk/fw_g473rct/SES/src/wh_counter.c

@@ -42 +42 @@
 
   double cefwh;
-  if (sys_data.s.values.calculatedCEFWh <= 0)
-  {
-        cefwh =  sys_data.s.parameter.cef / 100.0;
-  }
-  else
-  {
-        cefwh =  sys_data.s.values.calculatedCEFWh / 1000.0;
-  }
+//  if (sys_data.s.values.calculatedCEFWh <= 0)
+//  {
+        cefwh =  sys_data.s.parameter.cefW / 1000.0;
+ // }
+ // else
+ // {
+//      cefwh =  sys_data.s.values.calculatedCEFWh / 1000.0;
+//  }
   
   double realStrom;
@@ -57 +57 @@
   // bei Strom größer 0 -> Ladestrom CEF rechnen
   if (realStrom >= 0) {// 99 --> 99% --> 0.99
-    sys_data.s.values.correctedStromForChargeWhCnt = (realStrom * cefwh) ;    
+    sys_data.s.values.correctedStromForChargeWhCnt = (realStrom * cefwh * (sys_data.s.values.peukertRemoveCorrectionFaktor / 1000.0)) ;    
   } 
   else 
@@ -75 +75 @@
   sys_data.s.values.mWsCounter += p_mW; // Energy value for both positive and negative currents
   sys_data.s.values.mWs_AutoMode += p_mW;
-
+  
+  if (sys_data.s.values.soc > 0)
+  {
+        sys_data.s.values.mWsCounterUncorrected +=  ((int64_t) realStrom * sys_data.s.values.batteryVoltage )/ 1000LL;
+  }
 
   // Begrenzen, Batterie darf nicht über 100% gehen