Changeset 25 for trunk/fw_g473rct/SES/src/esr.c

Timestamp:

Sep 7, 2025, 3:51:43 PM (7 weeks ago)

Author:

f.jahn

Message:

RTC implementiert

File:

• trunk/fw_g473rct/SES/src/esr.c (modified) (8 diffs)

trunk/fw_g473rct/SES/src/esr.c

@@ -4 +4 @@
 #include "esr.h"
 #include <stdlib.h>
-#include <stdio.h>
+#include "main.h"
+#include "battery_voltage.h"
+#include "fast_current.h"
+
 
 
 int32_t current_buffer[SAMPLE_ARRAY_SIZE];  
 int32_t voltage_buffer[SAMPLE_ARRAY_SIZE];
-int32_t current_buffer_fast[SAMPLE_ARRAY_SIZE];  
-int32_t voltage_buffer_fast[SAMPLE_ARRAY_SIZE];
+//int32_t current_buffer_fast[SAMPLE_ARRAY_SIZE];  
+//int32_t voltage_buffer_fast[SAMPLE_ARRAY_SIZE];
+
+extern uint16_t adc12Data[SAMPLE_ARRAY_SIZE][2];
 
 
@@ -105 +110 @@
     for (x=0; x < SAMPLE_ARRAY_SIZE; x++)
     {
-      sys_data.s.values.current_buffer[(SAMPLE_ARRAY_SIZE-1)-x] = current_buffer[x];
-      sys_data.s.values.voltage_buffer[(SAMPLE_ARRAY_SIZE-1)-x] = voltage_buffer[x];
+      sys_data.s.values.current_buffer[(SAMPLE_ARRAY_SIZE-1)-x] = adc12Data[x][0];
+      sys_data.s.values.voltage_buffer[(SAMPLE_ARRAY_SIZE-1)-x] = adc12Data[x][1];
     }
 
@@ -126 +131 @@
   sys_data.s.values.esrCalcTime = sys_data.s.values.onTime - last_refresh;
 
-  for (x=SAMPLE_ARRAY_SIZE-1; x>0; x--)
-  {
-    current_buffer_fast[x] = current_buffer_fast[x-1];
-    voltage_buffer_fast[x] = voltage_buffer_fast[x-1];
-  }
-
-  // Neue Werte ins array aufnehmen
-  current_buffer_fast[0] = sys_data.s.values.fast_current;
-  voltage_buffer_fast[0] = sys_data.s.values.shuntVoltage;
 
 
@@ -150 +146 @@
   for (x=0; x < SAMPLE_ARRAY_SIZE; x++)
   {
-     if (abs(current_buffer_fast[x]) < minI)  { minI = abs(current_buffer_fast[x]); minIPos  = x; }
-     if (abs(current_buffer_fast[x]) >= maxI) { maxI = abs(current_buffer_fast[x]); maxdIPos = x; }  
-     if (abs(voltage_buffer_fast[x]) < minU)  { minU = abs(voltage_buffer_fast[x]); minUPos = x; }
-     if (abs(voltage_buffer_fast[x]) > maxU)  { maxU = abs(voltage_buffer_fast[x]); maxUPos = x; }
+     if (adc12Data[x][0] < minI)  { minI = adc12Data[x][0]; minIPos  = x; }
+     if (adc12Data[x][0] >= maxI) { maxI = adc12Data[x][0]; maxdIPos = x; }  
+     if (adc12Data[x][1] < minU)  { minU = adc12Data[x][1]; minUPos = x; }
+     if (adc12Data[x][1] > maxU)  { maxU = adc12Data[x][1]; maxUPos = x; }
   }
 
@@ -160 +156 @@
 
   //Delta berechnen
-  int32_t dI = abs (maxI - minI);
-  int32_t dU = abs (maxU - minU);
+  int32_t dI = maxI - minI;
+  int32_t dU = maxU - minU;
+
+  //Umrechnung in mV / mA
+  dI = dI * ((int64_t) VREF / FAST_CURRENT_SHUNT_RESISTOR /  FAST_CURRENT_I_SENSE_GAIN /  FAST_CURRENT_ADC_RESOLUTION);
+  dI = dI * (sys_data.s.parameter.batteryCurrentGainCorrectionFaktor / 1000000.0);
+
+  dU = dU  * VREF * BATTERY_VOLTAGE_VOLTAGE_DIVIDER / BATTERY_VOLTAGE_ADC_RESOLUTION ;
+  
 
   //Minimale Belastung Prüfen ob es genügent Änderungen gab
@@ -168 +171 @@
   int32_t min_dI;
   min_dI = sys_data.s.parameter.cellCapacity /  sys_data.s.parameter.cellRatedDischargeTime; //Nennlaststrom  in mA
-  min_dI = min_dI / 4 ;
-
-  int32_t min_dU = 100;
-  
-  if( dI < min_dI)
+  min_dI = min_dI / 10 ;
+ 
+
+  int32_t min_dU = 10;
+  
+  if( abs(dI) < min_dI)
   {
   
@@ -180 +184 @@
   //printf("dI change!\r\n");
 
-  if (dU < min_dU) {
+  if (abs(dU) < min_dU) {
     return -2;
   }
@@ -191 +195 @@
   int32_t dIMaxPos=-1;
  
+
+
+  //Finde Position der flanke
   for (x=0; x < (SAMPLE_ARRAY_SIZE-1); x++)
   {
-    dIx = abs(current_buffer_fast[x+1] - current_buffer_fast[x]); 
+    dIx = adc12Data[x+1][0] - adc12Data[x][0]; 
     if (dIx > dIMax) { dIMax = dIx; dIMaxPos = x; } 
   }
 
-
-
-  if (dIMaxPos == SAMPLE_ARRAY_SIZE / 2)
-  {
-    //ESR berechnen!
-    sys_data.s.values.esr_fast = ( (double)dU / (double) dI) * 1000;
-    last_refresh = sys_data.s.values.onTime;
-      
-
-    for (x=0; x < SAMPLE_ARRAY_SIZE; x++)
-    {
-      sys_data.s.values.current_buffer_fast[(SAMPLE_ARRAY_SIZE-1)-x] = current_buffer_fast[x];
-      sys_data.s.values.voltage_buffer_fast[(SAMPLE_ARRAY_SIZE-1)-x] = voltage_buffer_fast[x];
-    }
-
-
-
-
-  }
+  if ((dIMaxPos < 5 ) || (dIMaxPos > (SAMPLE_ARRAY_SIZE-5) ))
+  {
+        return -3;
+  }
+
+
+  //ESR berechnen!
+  sys_data.s.values.esr_fast = ( (double)dU / (double) dI) * 1000;
+  last_refresh = sys_data.s.values.onTime;
+        
+
+  for (x=0; x < SAMPLE_ARRAY_SIZE; x++)
+  {
+        sys_data.s.values.current_buffer_fast[x] = (int32_t) adc12Data[x][0] - FAST_CURRENT_ADC_OFFSET  ;
+        sys_data.s.values.voltage_buffer_fast[x] = (int32_t) adc12Data[x][1] - BATTERY_VOLTAGE_ADC_OFFSET ;
+  }
+
+
+
+
+  
   return 0;    
 }