Changeset 24 for trunk/fw_g473rct/SES/src/fast_current.c

Timestamp:

Aug 31, 2025, 6:56:29 PM (4 days ago)

Author:

f.jahn

Message:

Shunt Temperatursensor aktiviert

File:

• trunk/fw_g473rct/SES/src/fast_current.c (modified) (2 diffs)

trunk/fw_g473rct/SES/src/fast_current.c

@@ -17 +17 @@
 
 //      --- LOKALE DEFINES - bitte hier dokumentieren --------------------------------
-//#define FAST_CURRENT_FILTER  2
-
-
 
 #define I_SENSE_GAIN    40.0
+#define ADC_OFFSET                                                        32768
+#define ADC_RESOLUTION                                            32768 //65536/2 da im differential mode
 
 
@@ -51 +50 @@
 
 
-void FAST_CURRENT_Exec(uint32_t newvalP, uint32_t newvalM )
+void FAST_CURRENT_Exec(uint32_t newVal )
 {
-  static int measCounter;
-  static unsigned long avgsumP = 0;
-  uint32_t avgvalP;
-
-  if (measCounter < INT32_MAX) measCounter++;
-
-
-  // Filterlängen in 2er-Potenzen --> Compiler optimiert 
- // avgsumP -= avgsumP / FAST_CURRENT_FILTER;
- // avgsumP += newvalP;
-//  avgvalP = avgsumP / FAST_CURRENT_FILTER;
-
-//  static unsigned long avgsumM = 0;
-//  uint32_t avgvalM;
-  // Filterlängen in 2er-Potenzen --> Compiler optimiert 
-//  avgsumM -= avgsumM / FAST_CURRENT_FILTER;
-//  avgsumM += newvalM;
-//  avgvalM = avgsumM / FAST_CURRENT_FILTER;
-
-
-  //Berechne Differenzspannung am ADC Eingnag
-  double diff;
-  diff = (int32_t) newvalP - (int32_t) newvalM; 
-  diff = (diff * sys_data.s.values.realVdd)  / 65536;
-
+ 
   //Umrechung auf Strom
   double temp_current;
-  temp_current = (diff / I_SENSE_GAIN) /  SHUNT_RESISTOR;
+  temp_current = ((int32_t) newVal - ADC_OFFSET) * VREF ;
+  temp_current = temp_current / ADC_RESOLUTION;
+  temp_current = temp_current / I_SENSE_GAIN ;
+  temp_current = temp_current / SHUNT_RESISTOR ;
   sys_data.s.values.fast_current = temp_current * (sys_data.s.parameter.batteryCurrentGainCorrectionFaktor / 1000000.0);