Changeset 76 for trunk/fw_g473rct/SES

Timestamp:

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

Author:

f.jahn

Message:

 

Location:

trunk/fw_g473rct/SES

Files:

• inc/battery_voltage_fast.h (modified) (1 diff)
• smartPro.emProject (modified) (6 diffs)
• src/ads1260.c (modified) (2 diffs)
• src/battery_voltage_fast.c (modified) (1 diff)
• src/shunt_voltage_fast.c (modified) (2 diffs)

trunk/fw_g473rct/SES/inc/battery_voltage_fast.h

@@ -18 +18 @@
 
 
-#define BATTERY_VOLTAGE_FAST_ADC_RESOLUTION               65536 
-#define BATTERY_VOLTAGE_FAST_ADC_OFFSET                   32768
+
+#ifdef ADCOFFSET
+  #define BATTERY_VOLTAGE_FAST_ADC_RESOLUTION             65536 
+  #define BATTERY_VOLTAGE_FAST_ADC_OFFSET                         32768
+#else
+  #define BATTERY_VOLTAGE_FAST_ADC_RESOLUTION             32768
+  #define BATTERY_VOLTAGE_FAST_ADC_OFFSET                         32768
+#endif
 
 //--- GLOBALE VARIABLEN PROTOTYPEN ---------------------------------------------

trunk/fw_g473rct/SES/smartPro.emProject

@@ -71 +71 @@
     <configuration
       Name="Debug125A_48V_GM"
-      c_preprocessor_definitions="DEFAULT_PARAMETER_SYSTEM_VOLTAGE_12V;BATTERY_VOLTAGE_VOLTAGE_DIVIDER=44;SHUNT_VOLTAGE_VOLTAGE_DIVIDER=44;DEVICETYPE=125;NO_USB_SUPPORT;NO_TRISTATE_OUTPUTS" />
+      c_preprocessor_definitions="DEFAULT_PARAMETER_SYSTEM_VOLTAGE_12V;BATTERY_VOLTAGE_VOLTAGE_DIVIDER=44;SHUNT_VOLTAGE_VOLTAGE_DIVIDER=44;DEVICETYPE=125;NO_USB_SUPPORT;NO_TRISTATE_OUTPUTS;ADS1261;ADCOFFSET" />
     <configuration
       Name="Debug250A_12V"
-      c_preprocessor_definitions="DEVICETYPE=125;DEFAULT_PARAMETER_SYSTEM_VOLTAGE_12V;BATTERY_VOLTAGE_VOLTAGE_DIVIDER=6;SHUNT_VOLTAGE_VOLTAGE_DIVIDER=6" />
+      c_preprocessor_definitions="DEVICETYPE=250;DEFAULT_PARAMETER_SYSTEM_VOLTAGE_12V;BATTERY_VOLTAGE_VOLTAGE_DIVIDER=6;SHUNT_VOLTAGE_VOLTAGE_DIVIDER=6" />
     <configuration
       Name="Release125A_12V"
@@ -90 +90 @@
       Name="Release125A_48V_GM"
       arm_library_optimization="Fast"
-      c_preprocessor_definitions="DEFAULT_PARAMETER_SYSTEM_VOLTAGE_12V;BATTERY_VOLTAGE_VOLTAGE_DIVIDER=44;SHUNT_VOLTAGE_VOLTAGE_DIVIDER=44;DEVICETYPE=125;NO_USB_SUPPORT;NO_TRISTATE_OUTPUTS"
+      c_preprocessor_definitions="DEFAULT_PARAMETER_SYSTEM_VOLTAGE_12V;BATTERY_VOLTAGE_VOLTAGE_DIVIDER=44;SHUNT_VOLTAGE_VOLTAGE_DIVIDER=44;DEVICETYPE=125;NO_USB_SUPPORT;NO_TRISTATE_OUTPUTS;ADS1261;ADCOFFSET"
       gcc_debugging_level="None"
       gcc_optimization_level="Level 2 for speed"
@@ -100 +100 @@
       <folder Name="inc">
         <file file_name="../Core/Inc/adc.h" />
+        <file file_name="../Core/Inc/dac.h" />
         <file file_name="../Core/Inc/dma.h" />
         <file file_name="../Core/Inc/fdcan.h" />
@@ -115 +116 @@
         <file file_name="../Core/Src/adc.c" />
         <file file_name="../Core/Src/crc.c" />
+        <file file_name="../Core/Src/dac.c" />
         <file file_name="../Core/Src/dma.c" />
         <file file_name="../Core/Src/gpio.c" />
@@ -134 +136 @@
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_adc_ex.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_cortex.h" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_dac.h" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_dac_ex.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_def.h" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_dma.h" />
@@ -185 +189 @@
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_crc.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_crc_ex.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_dac.c" />
+        <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_dac_ex.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_dma.c" />
         <file file_name="../Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_dma_ex.c" />

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
+
+
+
 }