Changeset 38 for trunk/fw_g473rct/SES/inc

Timestamp:

Nov 1, 2025, 5:29:27 PM (2 days ago)

Author:

f.jahn

Message:

 

Location:

trunk/fw_g473rct/SES/inc

Files:

• battery_voltage.h (modified) (1 diff)
• outputs.h (modified) (2 diffs)
• sysdata.h (modified) (2 diffs)

trunk/fw_g473rct/SES/inc/battery_voltage.h

@@ -16 +16 @@
 
 //--- GLOBALE DEFINES ----------------------------------------------------------
-#define BATTERY_VOLTAGE_VOLTAGE_DIVIDER       6.0
+#if defined SYSTEM_VOLTAGE_12V
+  #define BATTERY_VOLTAGE_VOLTAGE_DIVIDER       6.0
+#elif defined SYSTEM_VOLTAGE_24V
+  #define BATTERY_VOLTAGE_VOLTAGE_DIVIDER       11.0
+#elif defined SYSTEM_VOLTAGE_48V
+  #define BATTERY_VOLTAGE_VOLTAGE_DIVIDER       21.0
+#else
+  #error "System voltage not defined"
+#endif
+
+
+
 #define BATTERY_VOLTAGE_ADC_RESOLUTION            32768.0 //65536/2 da im differential mode
 #define BATTERY_VOLTAGE_ADC_OFFSET                        32768.0

trunk/fw_g473rct/SES/inc/outputs.h

@@ -30 +30 @@
 #define OUTPUTS_LVP_SHUNT_UNDERTEMPERATURE              5
 #define OUTPUTS_LVP_CHIP_UNDERTEMPERATURE               6
+#define OUTPUTS_LVP_SHORT_PROTECTION                    7
 
 #define OUTPUTS_OVP_UNKNOWN                                             -1
@@ -39 +40 @@
 #define OUTPUTS_OVP_SHUNT_UNDERTEMPERATURE              5
 #define OUTPUTS_OVP_CHIP_UNDERTEMPERATURE               6
+#define OUTPUTS_OVP_SHORT_PROTECTION                    7
 
 #define OUTPUTS_LVP_MODE_AUTO                                   0U

trunk/fw_g473rct/SES/inc/sysdata.h

@@ -189 +189 @@
         /* 2 of 8 */ uint16_t ovp_sense;                                            // 168
         /* 4 of 8 */ uint16_t lvp_sense;                                            // 169
-        /* 6 of 8 */ uint32_t detectedCapacityAtActualCRate;                                            // 170,171
-        /* 8 of 8 */ uint32_t detectedEnergyAtActualCRate;                                                      // 172,173
+        /* 6 of 8 */ uint16_t overcurrentRetryCounter;                                                          // 170
+        /* 8 of 8 */ uint16_t overcurrentEventsTotal;                                                           // 171
+        /* 2 of 8 */ uint16_t overcurrentMeasurement;                                                           // 172
+        /* 4 of 8 */ uint16_t overcurrentMaxValue;                                                                      // 173
         /* 6 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 174
         /* 8 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 175
@@ -226 +228 @@
         /* 8 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 239
         /* 4 of 8 */ int64_t  mAs_AutoModeU;                                                                            // 240-243
-        /* 6 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 244
-        /* 8 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 245
-        /* 2 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 246
-        /* 4 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 247
+        /* 6 of 8 */ uint32_t detectedCapacityAtActualCRate;                                            // 244,245
+        /* 8 of 8 */ uint32_t detectedEnergyAtActualCRate;                                                      // 246,247
         /* 6 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 248
         /* 8 of 8 */ uint16_t UNIQUE_NAME(reserved);                                                            // 249