Changeset 27 for trunk/fw_g473rct/SES/src/eeprom.c

Timestamp:

Sep 10, 2025, 8:48:05 AM (7 weeks ago)

Author:

f.jahn

Message:

Fixing project before CubeMX regeneration.

File:

• trunk/fw_g473rct/SES/src/eeprom.c (modified) (14 diffs)

trunk/fw_g473rct/SES/src/eeprom.c

@@ -3 +3 @@
 #include "eeprom.h"
 #include "stdio.h"
-#include "math.h"
 #include "modbus.h"
 
@@ -20 +19 @@
 #define PAGE_SIZE 64     // in Bytes
 #define PAGE_NUM  4096    // number of pages
+        
+        
+#define PADDRPOSITION 6 //MUST BE calculated  for every eeprom type --//int paddrposition = log(PAGE_SIZE)/log(2);
 
 /********************************************************/
@@ -76 +78 @@
   uint16_t        uBatFull;
   uint16_t        uBatEmpty;
-  uint8_t         socCalcMode;
+  uint16_t        socCalcMode;
   uint16_t        cellRatedDischargeTime;
 
@@ -100 +102 @@
   int16_t         extraDischargeStrom_mA;                                       // For example, current that consumes LiPro itself
   uint16_t        cefW;
+  int16_t         batteryEmptyDetectionMode;            
 
 } eeprom_data_t;
@@ -221 +224 @@
         /* tBatFull                                     */                                                                                      2,                              // t-batt full 2 Sekunden
         /* uBatFull                                     */                                                                                      0,                              // 14V olt Ubatt full, Neu: Bei 0: Erkung von Lipro LVP als 0% 
-        /* uBatEmpty                            */                                                                                      -1,                             // 11,312V Ubatt Empty
+        /* uBatEmpty                            */                                                                                      11312,                          // 11,312V Ubatt Empty
         /* socCalcMode                          */                                                                                      1,                              // SoC calculation mode: 0(default)
         /* cellRatedDischargeTime       */                                                                                      2,                              // cell rated current discharge time [C/x]. For example, if 40Ah cell is rated as 0.5c, then rated discharge time is 2
@@ -257 +260 @@
         /* extraDischargeStrom_mA       */                                                                                      7,                              // mA, current that LiPro consumes itself
         /* cefW         */                                                                                                                      90,                             // 90% cef for Wh calculations
+        /* Battery Empty Detection Mode*/                                                                               1,                              // Auto, from BMS
         
 
@@ -371 +375 @@
   dataToStore->changedData.extraDischargeStrom_mA                                                                       = defaultEepromData.extraDischargeStrom_mA;
   dataToStore->changedData.cefW                                                                                                         = defaultEepromData.cefW;
+  dataToStore->changedData.batteryEmptyDetectionMode                                                            = defaultEepromData.batteryEmptyDetectionMode;
   
 
@@ -475 +480 @@
   dataToStore->changedData.extraDischargeStrom_mA                                                                       = defaultEepromData.extraDischargeStrom_mA;
   dataToStore->changedData.cefW                                                                                                         = defaultEepromData.cefW;
+  dataToStore->changedData.batteryEmptyDetectionMode                                                            = defaultEepromData.batteryEmptyDetectionMode;
  
 
@@ -570 +576 @@
   dataToStore->changedData.extraDischargeStrom_mA = data->s.parameter.extraDischargeStrom_mA;
   dataToStore->changedData.cefW = data->s.parameter.cefW;
- 
+  dataToStore->changedData.batteryEmptyDetectionMode = data->s.parameter.batteryEmptyDetectionMode;
+
   // Eeprom Status Infos
   dataToStore->eepromState.writeCounter++;
@@ -672 +679 @@
   data->s.parameter.extraDischargeStrom_mA                                                                              = dataToStore->changedData.extraDischargeStrom_mA;
   data->s.parameter.cefW                                                                                                                = dataToStore->changedData.cefW;
+  data->s.parameter.batteryEmptyDetectionMode                                                                   = dataToStore->changedData.batteryEmptyDetectionMode;
+        
 
 
@@ -713 +722 @@
 void EEPROM_Read (uint16_t page, uint16_t offset, uint8_t *data, uint16_t size)
 {
-        int paddrposition = log(PAGE_SIZE)/log(2);
+        //int paddrposition = log(PAGE_SIZE)/log(2);
+        int paddrposition = PADDRPOSITION;
 
         uint16_t startPage = page;
@@ -731 +741 @@
                 pos += bytesremaining;
         }
+
 }
 
@@ -738 +749 @@
 
         // Find out the number of bit, where the page addressing starts
-        int paddrposition = log(PAGE_SIZE)/log(2);
+        int paddrposition = PADDRPOSITION;
 
         // calculate the start page and the end page
@@ -758 +769 @@
 
                 HAL_I2C_Mem_Write(EEPROM_I2C, EEPROM_ADDR, MemAddress, 2, &data[pos], bytesremaining, 1000);  // write the data to the EEPROM
-
                 startPage += 1;  // increment the page, so that a new page address can be selected for further write
                 offset=0;   // since we will be writing to a new page, so offset will be 0