diff --git a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp index 18da01c0..20986f83 100644 --- a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp +++ b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.cpp @@ -219,8 +219,8 @@ static uint16_t poll_cell_min_voltage_number = 0; static uint16_t poll_amount_cells = 0; static uint16_t poll_specificial_voltage = 0; static uint16_t poll_unknown1 = 0; -static uint16_t poll_unknown2 = 0; -static uint16_t poll_unknown3 = 0; +static uint16_t poll_raw_soc_max = 0; +static uint16_t poll_raw_soc_min = 0; static uint16_t poll_unknown4 = 0; static uint16_t poll_unknown5 = 0; static uint16_t poll_unknown6 = 0; @@ -267,8 +267,8 @@ void update_values_battery() { //This function maps all the values fetched via datalayer_extended.geometryC.cellTotalAmount = poll_amount_cells; datalayer_extended.geometryC.specificialVoltage = poll_specificial_voltage; datalayer_extended.geometryC.unknown1 = poll_unknown1; - datalayer_extended.geometryC.unknown2 = poll_unknown2; - datalayer_extended.geometryC.unknown3 = poll_unknown3; + datalayer_extended.geometryC.rawSOCmax = poll_raw_soc_max; + datalayer_extended.geometryC.rawSOCmin = poll_raw_soc_min; datalayer_extended.geometryC.unknown4 = poll_unknown4; datalayer_extended.geometryC.unknown5 = poll_unknown5; datalayer_extended.geometryC.unknown6 = poll_unknown6; @@ -473,11 +473,11 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) { case POLL_UNKNOWN_1: poll_unknown1 = rx_frame.data.u8[4]; break; - case POLL_UNKNOWN_2: - poll_unknown2 = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]; + case POLL_RAW_SOC_MAX: + poll_raw_soc_max = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]; break; - case POLL_UNKNOWN_3: - poll_unknown3 = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]; + case POLL_RAW_SOC_MIN: + poll_raw_soc_min = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]; break; case POLL_UNKNOWN_4: poll_unknown4 = rx_frame.data.u8[4]; @@ -633,16 +633,16 @@ void transmit_can_battery() { case POLL_UNKNOWN_1: GEELY_POLL.data.u8[2] = (uint8_t)(POLL_UNKNOWN_1 >> 8); GEELY_POLL.data.u8[3] = (uint8_t)POLL_UNKNOWN_1; - poll_pid = POLL_UNKNOWN_2; + poll_pid = POLL_RAW_SOC_MAX; break; - case POLL_UNKNOWN_2: - GEELY_POLL.data.u8[2] = (uint8_t)(POLL_UNKNOWN_2 >> 8); - GEELY_POLL.data.u8[3] = (uint8_t)POLL_UNKNOWN_2; - poll_pid = POLL_UNKNOWN_3; + case POLL_RAW_SOC_MAX: + GEELY_POLL.data.u8[2] = (uint8_t)(POLL_RAW_SOC_MAX >> 8); + GEELY_POLL.data.u8[3] = (uint8_t)POLL_RAW_SOC_MAX; + poll_pid = POLL_RAW_SOC_MIN; break; - case POLL_UNKNOWN_3: - GEELY_POLL.data.u8[2] = (uint8_t)(POLL_UNKNOWN_3 >> 8); - GEELY_POLL.data.u8[3] = (uint8_t)POLL_UNKNOWN_3; + case POLL_RAW_SOC_MIN: + GEELY_POLL.data.u8[2] = (uint8_t)(POLL_RAW_SOC_MIN >> 8); + GEELY_POLL.data.u8[3] = (uint8_t)POLL_RAW_SOC_MIN; poll_pid = POLL_UNKNOWN_4; break; case POLL_UNKNOWN_4: diff --git a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h index 89f5086f..a5af0ee9 100644 --- a/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h +++ b/Software/src/battery/GEELY-GEOMETRY-C-BATTERY.h @@ -18,8 +18,8 @@ #define POLL_AMOUNT_CELLS 0x4B07 #define POLL_SPECIFICIAL_VOLTAGE 0x4B05 #define POLL_UNKNOWN_1 0x4BDA -#define POLL_UNKNOWN_2 0x4BC3 -#define POLL_UNKNOWN_3 0x4BC4 +#define POLL_RAW_SOC_MAX 0x4BC3 +#define POLL_RAW_SOC_MIN 0x4BC4 #define POLL_UNKNOWN_4 0xDF00 #define POLL_UNKNOWN_5 0x4B3D #define POLL_UNKNOWN_6 0x4B3E diff --git a/Software/src/datalayer/datalayer_extended.h b/Software/src/datalayer/datalayer_extended.h index 2171c04a..cb9a5401 100644 --- a/Software/src/datalayer/datalayer_extended.h +++ b/Software/src/datalayer/datalayer_extended.h @@ -285,8 +285,8 @@ typedef struct { uint16_t cellTotalAmount = 0; uint16_t specificialVoltage = 0; uint16_t unknown1 = 0; - uint16_t unknown2 = 0; - uint16_t unknown3 = 0; + uint16_t rawSOCmax = 0; + uint16_t rawSOCmin = 0; uint16_t unknown4 = 0; uint16_t unknown5 = 0; uint16_t unknown6 = 0; diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp index 45f79f5f..bb097fad 100644 --- a/Software/src/devboard/webserver/advanced_battery_html.cpp +++ b/Software/src/devboard/webserver/advanced_battery_html.cpp @@ -462,20 +462,20 @@ String advanced_battery_processor(const String& var) { sizeof(datalayer_extended.geometryC.BatterySerialNumber)); readableSerialNumber[15] = '\0'; // Null terminate the string content += "

Serial number: " + String(readableSerialNumber) + "

"; - content += "

SOC: " + String(datalayer_extended.geometryC.soc) + "dC

"; - content += "

CC2 voltage: " + String(datalayer_extended.geometryC.CC2voltage) + "dC

"; - content += "

Cell max voltage number: " + String(datalayer_extended.geometryC.cellMaxVoltageNumber) + "dC

"; - content += "

Cell min voltage number: " + String(datalayer_extended.geometryC.cellMinVoltageNumber) + "dC

"; - content += "

Cell total amount: " + String(datalayer_extended.geometryC.cellTotalAmount) + "dC

"; - content += "

Specificial Voltage: " + String(datalayer_extended.geometryC.specificialVoltage) + "dC

"; - content += "

Unknown1: " + String(datalayer_extended.geometryC.unknown1) + "dC

"; - content += "

Unknown2: " + String(datalayer_extended.geometryC.unknown2) + "dC

"; - content += "

Unknown3: " + String(datalayer_extended.geometryC.unknown3) + "dC

"; - content += "

Unknown4: " + String(datalayer_extended.geometryC.unknown4) + "dC

"; - content += "

Unknown5: " + String(datalayer_extended.geometryC.unknown5) + "dC

"; - content += "

Unknown6: " + String(datalayer_extended.geometryC.unknown6) + "dC

"; - content += "

Unknown7: " + String(datalayer_extended.geometryC.unknown7) + "dC

"; - content += "

Unknown8: " + String(datalayer_extended.geometryC.unknown8) + "dC

"; + content += "

SOC display: " + String(datalayer_extended.geometryC.soc) + "ppt

"; + content += "

CC2 voltage: " + String(datalayer_extended.geometryC.CC2voltage) + "mV

"; + content += "

Cell max voltage number: " + String(datalayer_extended.geometryC.cellMaxVoltageNumber) + "

"; + content += "

Cell min voltage number: " + String(datalayer_extended.geometryC.cellMinVoltageNumber) + "

"; + content += "

Cell total amount: " + String(datalayer_extended.geometryC.cellTotalAmount) + "S

"; + content += "

Specificial Voltage: " + String(datalayer_extended.geometryC.specificialVoltage) + "dV

"; + content += "

Unknown1: " + String(datalayer_extended.geometryC.unknown1) + "

"; + content += "

Raw SOC max: " + String(datalayer_extended.geometryC.rawSOCmax) + "

"; + content += "

Raw SOC min: " + String(datalayer_extended.geometryC.rawSOCmin) + "

"; + content += "

Unknown4: " + String(datalayer_extended.geometryC.unknown4) + "

"; + content += "

Unknown5: " + String(datalayer_extended.geometryC.unknown5) + "

"; + content += "

Unknown6: " + String(datalayer_extended.geometryC.unknown6) + "

"; + content += "

Unknown7: " + String(datalayer_extended.geometryC.unknown7) + "

"; + content += "

Unknown8: " + String(datalayer_extended.geometryC.unknown8) + "

"; #endif //GEELY_GEOMETRY_C_BATTERY #ifdef KIA_HYUNDAI_64_BATTERY