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

Timestamp:

Apr 1, 2026, 9:33:58 AM (5 weeks ago)

Author:

f.jahn

Message:

Fixing Projects.

File:

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

trunk/fw_g473rct/SES/src/esr.c

@@ -14 +14 @@
 
 
-extern uint16_t adc12Data[SAMPLE_ARRAY_SIZE][2];
+extern uint16_t adc1Data[SAMPLE_ARRAY_SIZE];
+extern uint16_t adc2Data[SAMPLE_ARRAY_SIZE];
+extern uint16_t adc4Data[SAMPLE_ARRAY_SIZE];
 
 
@@ -109 +111 @@
     for (x=0; x < SAMPLE_ARRAY_SIZE; 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];
+      sys_data.s.values.current_buffer[(SAMPLE_ARRAY_SIZE-1)-x] = adc1Data[x];
+      sys_data.s.values.voltage_buffer[(SAMPLE_ARRAY_SIZE-1)-x] = adc2Data[x];
     }
 
@@ -134 +136 @@
 
   //Suche Min und max werte im Array
-  int32_t minU=INT32_MAX;
-  int32_t maxU=0;
+  int32_t minUBatt=INT32_MAX;
+  int32_t maxUBatt=0;
+  int32_t minUOut=INT32_MAX;
+  int32_t maxUOut=0;
   int32_t minI=INT32_MAX;
   int32_t maxI=0;
   int32_t minIPos = -1;
   int32_t maxdIPos = -1;
-  int32_t minUPos = -1;
-  int32_t maxUPos = -1;
+  int32_t minUBattPos = -1;
+  int32_t maxUBattPos = -1;
+  int32_t minUOutPos = -1;
+  int32_t maxUOutPos = -1;
 
   //Suche min und max werte
   for (x=0; x < SAMPLE_ARRAY_SIZE; 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; }
+     if (adc1Data[x] < minI)  { minI = adc1Data[x]; minIPos  = x; }
+     if (adc1Data[x] >= maxI) { maxI = adc2Data[x]; maxdIPos = x; }  
+     if (adc2Data[x] < minUBatt)  { minUBatt = adc2Data[x]; minUBattPos = x; }
+     if (adc2Data[x] > maxUBatt)  { maxUBatt = adc2Data[x]; maxUBattPos = x; }
+         if (adc4Data[x] < minUOut)  { minUOut = adc4Data[x]; minUOutPos = x; }
+     if (adc4Data[x] > maxUOut)  { maxUOut = adc4Data[x]; maxUOutPos = x; }
   }
 
@@ -161 +169 @@
   //Funktioniert nur bei Synchroner Messug von Strom und Spannung
   //int32_t dU = maxU - minU;
-  int32_t dU = adc12Data[maxdIPos][1]  - adc12Data[minIPos][1];
+  int32_t dUBatt = adc2Data[maxdIPos]  - adc2Data[minIPos];
+  int32_t dUOut =  adc4Data[maxdIPos]  - adc4Data[minIPos];
 
   //Umrechnung in mV / mA
@@ -167 +176 @@
   dI = dI * (sys_data.s.parameter.batteryCurrentGainCorrectionFaktor / 1000000.0);
 
-  dU = dU  * (double )VREF * BATTERY_VOLTAGE_VOLTAGE_DIVIDER / BATTERY_VOLTAGE_ADC_RESOLUTION ;
-  
+  dUBatt = dUBatt  * (double )VREF * BATTERY_VOLTAGE_VOLTAGE_DIVIDER / BATTERY_VOLTAGE_ADC_RESOLUTION ;
+  dUOut  = dUOut  * (double )VREF * BATTERY_VOLTAGE_VOLTAGE_DIVIDER / BATTERY_VOLTAGE_ADC_RESOLUTION ;
 
   //Minimale Belastung Prüfen ob es genügent Änderungen gab
@@ -188 +197 @@
   //printf("dI change!\r\n");
 
-  if (abs(dU) < min_dU) {
-    return -2;
-  }
+  //if (abs(dU) < min_dU) {
+  //  return -2;
+  //}
 
   //printf("dU change!\r\n");
@@ -204 +213 @@
   for (x=0; x < (SAMPLE_ARRAY_SIZE-1); x++)
   {
-    dIx = adc12Data[x+1][0] - adc12Data[x][0]; 
+    dIx = adc1Data[x+1] - adc1Data[x]; 
     if (dIx > dIMax) { dIMax = dIx; dIMaxPos = x; } 
   }
 
-  //if ((dIMaxPos < 5 ) || (dIMaxPos > (SAMPLE_ARRAY_SIZE-5) ))
-  //{
-//      return -3;
- // }
+  
 
 
   //ESR berechnen!
-  sys_data.s.values.esr_fast = ( (double)dU / (double) dI) * 10000;
+  sys_data.s.values.esr_fast = ( (double)dUBatt / (double) dI) * 10000;
+  sys_data.s.values.esr =          ( (double)dUOut  / (double) dI) * 10000;
   last_refresh = sys_data.s.values.onTime;
         
@@ -221 +228 @@
   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 ;
+        sys_data.s.values.current_buffer_fast[x] = (int32_t) adc1Data[x] - FAST_CURRENT_ADC_OFFSET  ;
+        sys_data.s.values.voltage_buffer_fast[x] = (int32_t) adc2Data[x] - BATTERY_VOLTAGE_ADC_OFFSET ;
   }