Changeset 28 for trunk/fw_g473rct/SES/src/ah_counter.c

Timestamp:

Sep 11, 2025, 4:17:09 PM (7 weeks ago)

Author:

f.jahn

Message:

 

File:

• trunk/fw_g473rct/SES/src/ah_counter.c (modified) (6 diffs)

trunk/fw_g473rct/SES/src/ah_counter.c

@@ -27 +27 @@
 //      --- LOKALE VARIABLEN - bitte hier dokumentieren ------------------------------
 int startMeasurement = 0;
+int startMeasurementCEF = 0;
 //      --- LOKALE FUNKTIONS PROTOTYPEN ----------------------------------------------
 int getSocAhRated(void);
@@ -97 +98 @@
 
 
+  int32_t realStrom = (int32_t)  sys_data.s.values.batteryCurrent - sys_data.s.parameter.extraDischargeStrom_mA;
 
   // bei Strom größer 0 -> Ladestrom CEF rechnen
-  if(sys_data.s.values.batteryCurrent >= 0)
+  if (realStrom >= 0)
   {
           //99 --> 99% --> 0.99
-          cef =  sys_data.s.parameter.cef / 100.0;
-          sys_data.s.values.batteryCurrentCorrected = sys_data.s.values.batteryCurrent * cef;
-  }
-  else
+          if (sys_data.s.values.calculatedCEFAh <= 0)
+          {
+                cef =  sys_data.s.parameter.cef / 100.0;
+          }
+          else
+          {
+                cef =  sys_data.s.values.calculatedCEFAh / 1000.0;
+          }
+          sys_data.s.values.batteryCurrentCorrected = realStrom * cef;
+  }
+  else // if (realStrom < 0)
   {       // bei Strom kleiner 0 peukert rechnen
           //int32_t ratedCurrent = sys_data.s.parameter.cellRatedCurrent * 1000;
           int32_t ratedCurrent = sys_data.s.parameter.cellCapacity / sys_data.s.parameter.cellRatedDischargeTime;
-
-          if (sys_data.s.values.batteryCurrent < -ratedCurrent) //ACHTUNG mit Minus das vorzeichen gedreht!
+          
+
+          if (realStrom < -ratedCurrent) //ACHTUNG mit Minus das vorzeichen gedreht!
           {
-                  current = sys_data.s.values.batteryCurrent;
+                  current = realStrom;
                   iBatDivIbatNenn = current / ratedCurrent;
                   iBatDivIbatNenn = -iBatDivIbatNenn;
@@ -119 +129 @@
                   sys_data.s.values.batteryCurrentCorrected = (current * calcPow);
           }
-          else sys_data.s.values.batteryCurrentCorrected = sys_data.s.values.batteryCurrent;
-  }
-
-  sys_data.s.values.batteryCurrentCorrected -= (int32_t)sys_data.s.parameter.extraDischargeStrom_mA;
-
+          else sys_data.s.values.batteryCurrentCorrected = realStrom;
+  }
+
+  
   // Counting negative current
   if (sys_data.s.values.batteryCurrent < 0)
   {
-          totalDischarge += -sys_data.s.values.batteryCurrent;
+          totalDischarge += -realStrom;
           sys_data.s.values.dischargeTotalAh = totalDischarge / 3600000; //Umrechnung von mAs auf Ah
 
-
           sys_data.s.values.fullCyclesCnt = (uint16_t) ((sys_data.s.values.dischargeTotalAh * 1000) / sys_data.s.parameter.cellCapacity);
   }
   else
   {
-          totalCharge += sys_data.s.values.batteryCurrent;
+          totalCharge += realStrom;
           sys_data.s.values.chargeTotalAh = totalCharge / 3600000; //Umrechnung von mAs auf Ah
   }
-
 
 
   // Aufsummieren
   sys_data.s.values.mAsCounter += sys_data.s.values.batteryCurrentCorrected;
-  sys_data.s.values.mAs_AutoMode += (int64_t)sys_data.s.values.batteryCurrentCorrected;
+  sys_data.s.values.mAs_AutoMode += sys_data.s.values.batteryCurrentCorrected;
   sys_data.s.values.mAh_AutoMode = sys_data.s.values.mAs_AutoMode / 3600LL;
+  sys_data.s.values.ahCounterCEF_AutoMode +=  sys_data.s.values.batteryCurrentCorrected;
+  sys_data.s.values.whCounterCEF_AutoMode +=  sys_data.s.values.batteryCurrentCorrected * sys_data.s.values.batteryVoltage;
 
   // Begrenzen, Batterie darf nicht über 100% gehen
@@ -175 +184 @@
         //und wir starten eine neue Battery Kapazitäts und Energiemessung
         startMeasurement = 1;
+
+        if (startMeasurementCEF == 1)
+        {
+          startMeasurementCEF=0;
+          sys_data.s.values.calculatedCEFAh = 1000 * (sys_data.s.values.detectedCapacity * 3600) / sys_data.s.values.ahCounterCEF_AutoMode ;
+          sys_data.s.values.calculatedCEFWh = 1000 * (sys_data.s.values.detectedEnergy * 3600) / sys_data.s.values.whCounterCEF_AutoMode;
+        }
   }
 
   sys_data.s.values.mAhCounter = sys_data.s.values.mAsCounter / 3600LL;
 
+  // --- BATTERY LEER ERKENNUNG
   static uint16_t cnt;
   if (sys_data.s.parameter.batteryEmptyDetectionMode == 0)
@@ -191 +208 @@
                   if ((sys_data.s.values.lastTimeVbatFull >= 3600U) && (sys_data.s.values.lastTimeVbatFull <= 200U * 3600U))    // This line prevents from very high discharge-currents to be used to estimate battery capacity
                   {
-                          // This line is not so important anymore, because we do not allow mAh_AutoMode to be greater than zero
+                          
                           AH_COUNTER_SetDetectedAh();
                           WH_COUNTER_SetDetectedEnergy();
+                          sys_data.s.values.ahCounterCEF_AutoMode = 0;
+                          sys_data.s.values.whCounterCEF_AutoMode = 0;
                           startMeasurement = 0;                   
                   }
@@ -222 +241 @@
                           WH_COUNTER_SetDetectedEnergy();
                           startMeasurement = 0;                   
+                          startMeasurementCEF = 1;
                   }
                   sys_data.s.values.lastTimeVbatEmpty = 0U;