yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-05 02:39:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add software version number reading

Browse source
This commit is contained in:
Daniel Öster 2025-04-21 13:52:10 +03:00
parent 3b51872aa0
commit e8bdc22356
4 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp
View file

@ -228,6 +228,7 @@ static uint16_t poll_unknown7 = 0;
static uint16_t poll_unknown8 = 0; static uint16_t poll_unknown8 = 0;
static int16_t poll_temperature[6] = {0}; static int16_t poll_temperature[6] = {0};
#define TEMP_OFFSET 30 //TODO, not calibrated yet, best guess #define TEMP_OFFSET 30 //TODO, not calibrated yet, best guess
static uint8_t poll_software_version[16] = {0};
void update_values_battery() { //This function maps all the values fetched via CAN to the correct parameters used for modbus void update_values_battery() { //This function maps all the values fetched via CAN to the correct parameters used for modbus
datalayer.battery.status.soh_pptt; datalayer.battery.status.soh_pptt;
@ -282,6 +283,7 @@ void update_values_battery() { //This function maps all the values fetched via
//Update webserver more battery info page //Update webserver more battery info page
memcpy(datalayer_extended.geometryC.BatterySerialNumber, serialnumbers, sizeof(serialnumbers)); memcpy(datalayer_extended.geometryC.BatterySerialNumber, serialnumbers, sizeof(serialnumbers));
memcpy(datalayer_extended.geometryC.ModuleTemperatures, poll_temperature, sizeof(poll_temperature)); memcpy(datalayer_extended.geometryC.ModuleTemperatures, poll_temperature, sizeof(poll_temperature));
memcpy(datalayer_extended.geometryC.BatterySoftwareVersion, poll_software_version, sizeof(poll_software_version));
datalayer_extended.geometryC.soc = poll_soc; datalayer_extended.geometryC.soc = poll_soc;
datalayer_extended.geometryC.CC2voltage = poll_cc2_voltage; datalayer_extended.geometryC.CC2voltage = poll_cc2_voltage;
datalayer_extended.geometryC.cellMaxVoltageNumber = poll_cell_max_voltage_number; datalayer_extended.geometryC.cellMaxVoltageNumber = poll_cell_max_voltage_number;
@ -540,6 +542,36 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
break; break;
} }
break; break;
case POLL_MULTI_SOFTWARE_VERSION:
switch (rx_frame.data.u8[0]) {
case 0x10:
poll_software_version[0] = rx_frame.data.u8[5];
poll_software_version[1] = rx_frame.data.u8[6];
poll_software_version[2] = rx_frame.data.u8[7];
break;
case 0x21:
poll_software_version[3] = rx_frame.data.u8[1];
poll_software_version[4] = rx_frame.data.u8[2];
poll_software_version[5] = rx_frame.data.u8[3];
poll_software_version[6] = rx_frame.data.u8[4];
poll_software_version[7] = rx_frame.data.u8[5];
poll_software_version[8] = rx_frame.data.u8[6];
poll_software_version[9] = rx_frame.data.u8[7];
break;
case 0x22:
poll_software_version[10] = rx_frame.data.u8[1];
poll_software_version[11] = rx_frame.data.u8[2];
poll_software_version[12] = rx_frame.data.u8[3];
poll_software_version[13] = rx_frame.data.u8[4];
poll_software_version[14] = rx_frame.data.u8[5];
poll_software_version[15] = rx_frame.data.u8[6];
break;
case 0x23:
break;
default:
break;
}
break;
default: default:
//Not a multiframe response, do nothing //Not a multiframe response, do nothing
break; break;
@ -741,11 +773,11 @@ void transmit_can_battery() {
case POLL_MULTI_UNKNOWN_5: case POLL_MULTI_UNKNOWN_5:
GEELY_POLL.data.u8[2] = (uint8_t)(POLL_MULTI_UNKNOWN_5 >> 8); GEELY_POLL.data.u8[2] = (uint8_t)(POLL_MULTI_UNKNOWN_5 >> 8);
GEELY_POLL.data.u8[3] = (uint8_t)POLL_MULTI_UNKNOWN_5; GEELY_POLL.data.u8[3] = (uint8_t)POLL_MULTI_UNKNOWN_5;
poll_pid = POLL_MULTI_UNKNOWN_6; poll_pid = POLL_MULTI_SOFTWARE_VERSION;
break; break;
case POLL_MULTI_UNKNOWN_6: case POLL_MULTI_SOFTWARE_VERSION:
GEELY_POLL.data.u8[2] = (uint8_t)(POLL_MULTI_UNKNOWN_6 >> 8); GEELY_POLL.data.u8[2] = (uint8_t)(POLL_MULTI_SOFTWARE_VERSION >> 8);
GEELY_POLL.data.u8[3] = (uint8_t)POLL_MULTI_UNKNOWN_6; GEELY_POLL.data.u8[3] = (uint8_t)POLL_MULTI_SOFTWARE_VERSION;
poll_pid = POLL_SOC; poll_pid = POLL_SOC;
break; break;
default: default:

2
Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h
View file

@ -30,7 +30,7 @@
#define POLL_MULTI_UNKNOWN_3 0x4B53 #define POLL_MULTI_UNKNOWN_3 0x4B53
#define POLL_MULTI_UNKNOWN_4 0x4B54 #define POLL_MULTI_UNKNOWN_4 0x4B54
#define POLL_MULTI_UNKNOWN_5 0x4B6B #define POLL_MULTI_UNKNOWN_5 0x4B6B
#define POLL_MULTI_UNKNOWN_6 0x4B6C #define POLL_MULTI_SOFTWARE_VERSION 0x4B6C
void setup_battery(void); void setup_battery(void);
void transmit_can_frame(CAN_frame* tx_frame, int interface); void transmit_can_frame(CAN_frame* tx_frame, int interface);

3
Software/src/datalayer/datalayer_extended.h
View file

@ -273,6 +273,9 @@ typedef struct {
} DATALAYER_INFO_CMFAEV; } DATALAYER_INFO_CMFAEV;
typedef struct { typedef struct {
/** uint8_t */
/** Battery software version, stores raw HEX values for ASCII chars */
uint8_t BatterySoftwareVersion[16] = {0};
/** uint8_t */ /** uint8_t */
/** Battery serial numbers, stores raw HEX values for ASCII chars */ /** Battery serial numbers, stores raw HEX values for ASCII chars */
uint8_t BatterySerialNumber[28] = {0}; uint8_t BatterySerialNumber[28] = {0};

9
Software/src/devboard/webserver/advanced_battery_html.cpp
View file

@ -460,8 +460,13 @@ String advanced_battery_processor(const String& var) {
char readableSerialNumber[29]; // One extra space for null terminator char readableSerialNumber[29]; // One extra space for null terminator
memcpy(readableSerialNumber, datalayer_extended.geometryC.BatterySerialNumber, memcpy(readableSerialNumber, datalayer_extended.geometryC.BatterySerialNumber,
sizeof(datalayer_extended.geometryC.BatterySerialNumber)); sizeof(datalayer_extended.geometryC.BatterySerialNumber));
readableSerialNumber[15] = '\0'; // Null terminate the string readableSerialNumber[28] = '\0'; // Null terminate the string
content += "<h4>Serial number: " + String(readableSerialNumber) + "</h4>"; char readableSoftwareVersion[17]; // One extra space for null terminator
memcpy(readableSoftwareVersion, datalayer_extended.geometryC.BatterySoftwareVersion,
sizeof(datalayer_extended.geometryC.BatterySoftwareVersion));
readableSoftwareVersion[16] = '\0'; // Null terminate the string
content += "<h4>Serial number: " + String(readableSoftwareVersion) + "</h4>";
content += "<h4>Software version: " + String(readableSerialNumber) + "</h4>";
content += "<h4>SOC display: " + String(datalayer_extended.geometryC.soc) + "ppt</h4>"; content += "<h4>SOC display: " + String(datalayer_extended.geometryC.soc) + "ppt</h4>";
content += "<h4>CC2 voltage: " + String(datalayer_extended.geometryC.CC2voltage) + "mV</h4>"; content += "<h4>CC2 voltage: " + String(datalayer_extended.geometryC.CC2voltage) + "mV</h4>";
content += "<h4>Cell max voltage number: " + String(datalayer_extended.geometryC.cellMaxVoltageNumber) + "</h4>"; content += "<h4>Cell max voltage number: " + String(datalayer_extended.geometryC.cellMaxVoltageNumber) + "</h4>";