Changeset 76 for trunk/fw_g473rct/SES/src

Timestamp:

Sep 9, 2026, 3:02:30 PM (11 days ago)

Author:

f.jahn

Message:

 

Location:

trunk/fw_g473rct/SES/src

Files:

• ads1260.c (modified) (2 diffs)
• battery_voltage_fast.c (modified) (1 diff)
• shunt_voltage_fast.c (modified) (2 diffs)

trunk/fw_g473rct/SES/src/ads1260.c

@@ -960 +960 @@
     }
 
+#ifdef ADS1261
         if (channelInProgress==0)
         {
@@ -978 +979 @@
           channelInProgress=0;
         }
-
+#else
+          ADS1260_ProcessCurrent(value);
+          //ADS_1260_InputMuxSelect(&hspi3, POS_INPUT_MUX_SELECT_AIN4 + NEG_INPUT_MUX_SELECT_AIN5,1);
+          //channelInProgress=0;
+#endif
         ADS1260_StartConversion();
 }

trunk/fw_g473rct/SES/src/battery_voltage_fast.c

@@ -43 +43 @@
   sys_data.s.values.batteryVoltageFast = ((newVal - BATTERY_VOLTAGE_FAST_ADC_OFFSET) * (int64_t)VREF * BATTERY_VOLTAGE_VOLTAGE_DIVIDER / BATTERY_VOLTAGE_FAST_ADC_RESOLUTION) - sys_data.s.parameter.batteryVoltageFastOffset;
 
+
+
+#ifdef ADS1261
+  //Batteriespannung wird vom ADS1261 genommen. Wird im ADS Modul ausgewertet
+#else
+  sys_data.s.values.batteryVoltage = ((newVal - BATTERY_VOLTAGE_FAST_ADC_OFFSET ) * (int64_t)VREF * BATTERY_VOLTAGE_VOLTAGE_DIVIDER / BATTERY_VOLTAGE_FAST_ADC_RESOLUTION) - sys_data.s.parameter.batteryVoltageFastOffset;
+
+
+#endif
+
  }
 

trunk/fw_g473rct/SES/src/shunt_voltage_fast.c

@@ -18 +18 @@
 extern __IO int32_t adc4Data[SAMPLE_ARRAY_SIZE] __attribute__((section(".RAM1_CRC")));
 //      --- LOKALE DEFINES - bitte hier dokumentieren --------------------------------
-#define SHUNT_VOLTAGE_FAST_ADC_RESOLUTION                                                 65536 
-#define SHUNT_VOLTAGE_FAST_ADC_OFFSET                                                     32768
+//#define SHUNT_VOLTAGE_FAST_ADC_RESOLUTION                                               65536 
+//#define SHUNT_VOLTAGE_FAST_ADC_OFFSET                                                   32768
 
 
+#ifdef ADCOFFSET
+  #define SHUNT_VOLTAGE_FAST_ADC_RESOLUTION               65536 
+  #define SHUNT_VOLTAGE_FAST_ADC_OFFSET                   32768
+#else
+  #define SHUNT_VOLTAGE_FAST_ADC_RESOLUTION               32768
+  #define SHUNT_VOLTAGE_FAST_ADC_OFFSET                   32768
+#endif
 
 
@@ -51 +58 @@
   sys_data.s.values.shuntVoltageFast =  ((newval - SHUNT_VOLTAGE_FAST_ADC_OFFSET) * (int64_t) (VREF) * SHUNT_VOLTAGE_VOLTAGE_DIVIDER / SHUNT_VOLTAGE_FAST_ADC_RESOLUTION) - sys_data.s.parameter.shuntVoltageFastOffset ;
 
+#ifdef ADS1261
+  //Batteriespannung wird vom ADS1261 genommen
+#else
+  sys_data.s.values.shuntVoltage =  ((newval - SHUNT_VOLTAGE_FAST_ADC_OFFSET) * (int64_t) (VREF) * SHUNT_VOLTAGE_VOLTAGE_DIVIDER / SHUNT_VOLTAGE_FAST_ADC_RESOLUTION) - sys_data.s.parameter.shuntVoltageFastOffset ;
+
+
+#endif
+
+
+
 }