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

Timestamp:

Sep 8, 2025, 6:57:30 PM (7 weeks ago)

Author:

f.jahn

Message:

• Bug in ADC Kalibrierung (STM32 ADC Strom) behoben
• DMA Buffer für ADC 1 und ADC wird vor Überschreibung während bearbeitung geschützt, indem Datenübertragung nur einmalig erfolgt und erst nach Auswertung wieder gestartet wird
• RS485Modbus: Timeout Zeit wird für Baudraten >19200 korrekt berechnet
• Hardware ID geändert
• Separates Register für "Batterie Empty detection mode" auf Adresse 92 angelegt

File:

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

trunk/fw_g473rct/SES/src/fast_current.c

@@ -32 +32 @@
 
 //      --- GLOBALE FUNKTIONEN - bitte in Header dokumentieren------------------------
+void CurrentOffsetCal(uint32_t newVal)
+{
+  sys_data.s.parameter.batteryCurrentOffsetFast = newVal-FAST_CURRENT_ADC_OFFSET;
+}
 
+void CurrentGainCal(uint32_t newVal)
+{
+  double correction;
+  double valWithoutGainCorrection;
 
+  valWithoutGainCorrection = ((int32_t) newVal - FAST_CURRENT_ADC_OFFSET - sys_data.s.parameter.batteryCurrentOffsetFast) * VREF ;
+  valWithoutGainCorrection = valWithoutGainCorrection / FAST_CURRENT_ADC_RESOLUTION;
+  valWithoutGainCorrection = valWithoutGainCorrection / FAST_CURRENT_I_SENSE_GAIN ;
+  valWithoutGainCorrection = valWithoutGainCorrection / FAST_CURRENT_SHUNT_RESISTOR ;
+
+  correction = (double)  sys_data.s.parameter.batteryCurrentGainRefCurrent / valWithoutGainCorrection;
+  sys_data.s.parameter.batteryCurrentGainCorrectionFaktorFast = correction * 1000000;
+
+}
 void FAST_CURRENT_Exec(uint32_t newVal )
 {
@@ -39 +56 @@
   //Umrechung auf Strom
   double temp_current;
-  temp_current = ((int32_t) newVal - FAST_CURRENT_ADC_OFFSET) * VREF ;
+  temp_current = ((int32_t) newVal - FAST_CURRENT_ADC_OFFSET - sys_data.s.parameter.batteryCurrentOffsetFast) * VREF ;
   temp_current = temp_current / FAST_CURRENT_ADC_RESOLUTION;
   temp_current = temp_current / FAST_CURRENT_I_SENSE_GAIN ;
   temp_current = temp_current / FAST_CURRENT_SHUNT_RESISTOR ;
-  sys_data.s.values.fast_current = temp_current * (sys_data.s.parameter.batteryCurrentGainCorrectionFaktor / 1000000.0);
+  sys_data.s.values.fast_current = temp_current * (sys_data.s.parameter.batteryCurrentGainCorrectionFaktorFast / 1000000.0);
  
 }