diff --git a/Software/src/battery/BMW-IX-HTML.h b/Software/src/battery/BMW-IX-HTML.h index 64b88fb9..27bd3d56 100644 --- a/Software/src/battery/BMW-IX-HTML.h +++ b/Software/src/battery/BMW-IX-HTML.h @@ -25,13 +25,37 @@ class BmwIXHtmlRenderer : public BatteryHtmlRenderer { content += "

Allowed Charge Power: " + String(datalayer.battery.status.max_charge_power_W) + " W

"; content += "

T30 Terminal Voltage: " + String(datalayer_extended.bmwix.T30_Voltage) + " mV

"; content += "

Detected Cell Count: " + String(datalayer.battery.info.number_of_cells) + "

"; - static const char* balanceText[5] = {"0 No balancing mode active", "1 Voltage-Controlled Balancing Mode", - "2 Time-Controlled Balancing Mode with Demand Calculation at End of Charging", - "3 Time-Controlled Balancing Mode with Demand Calculation at Resting Voltage", - "4 No balancing mode active, qualifier invalid"}; - content += "

Balancing: " + String((balanceText[datalayer_extended.bmwix.balancing_status])) + "

"; - static const char* hvilText[2] = {"Error (Loop Open)", "OK (Loop Closed)"}; - content += "

HVIL Status: " + String(hvilText[datalayer_extended.bmwix.hvil_status]) + "

"; + content += "

Balancing: "; + switch (datalayer_extended.bmwix.balancing_status) { + case 0: + content += "0 No balancing mode active

"; + break; + case 1: + content += "1 Voltage-Controlled Balancing Mode"; + break; + case 2: + content += "2 Time-Controlled Balancing Mode with Demand Calculation at End of Charging"; + break; + case 3: + content += "3 Time-Controlled Balancing Mode with Demand Calculation at Resting Voltage"; + break; + case 4: + content += "4 No balancing mode active, qualifier invalid"; + break; + default: + content += "Unknown"; + } + content += "

HVIL Status: "; + switch (datalayer_extended.bmwix.hvil_status) { + case 0: + content += "Error (Loop Open)

"; + break; + case 1: + content += "OK (Loop Closed)"; + break; + default: + content += "Unknown"; + } content += "

BMS Uptime: " + String(datalayer_extended.bmwix.bms_uptime) + " seconds

"; content += "

BMS Allowed Charge Amps: " + String(datalayer_extended.bmwix.allowable_charge_amps) + " A

"; content += @@ -41,11 +65,66 @@ class BmwIXHtmlRenderer : public BatteryHtmlRenderer { content += "

Isolation Positive: " + String(datalayer_extended.bmwix.iso_safety_positive) + " kOhm

"; content += "

Isolation Negative: " + String(datalayer_extended.bmwix.iso_safety_negative) + " kOhm

"; content += "

Isolation Parallel: " + String(datalayer_extended.bmwix.iso_safety_parallel) + " kOhm

"; - static const char* pyroText[5] = {"0 Value Invalid", "1 Successfully Blown", "2 Disconnected", - "3 Not Activated - Pyro Intact", "4 Unknown"}; - content += "

Pyro Status PSS1: " + String((pyroText[datalayer_extended.bmwix.pyro_status_pss1])) + "

"; - content += "

Pyro Status PSS4: " + String((pyroText[datalayer_extended.bmwix.pyro_status_pss4])) + "

"; - content += "

Pyro Status PSS6: " + String((pyroText[datalayer_extended.bmwix.pyro_status_pss6])) + "

"; + content += "

Pyro Status PSS1: "; + switch (datalayer_extended.bmwix.pyro_status_pss1) { + case 0: + content += "0 Value Invalid

"; + break; + case 1: + content += "1 Successfully Blown"; + break; + case 2: + content += "2 Disconnected"; + break; + case 3: + content += "3 Not Activated - Pyro Intact"; + break; + case 4: + content += "4 Unknown"; + break; + default: + content += "Unknown"; + } + content += "

Pyro Status PSS4: "; + switch (datalayer_extended.bmwix.pyro_status_pss4) { + case 0: + content += "0 Value Invalid

"; + break; + case 1: + content += "1 Successfully Blown"; + break; + case 2: + content += "2 Disconnected"; + break; + case 3: + content += "3 Not Activated - Pyro Intact"; + break; + case 4: + content += "4 Unknown"; + break; + default: + content += "Unknown"; + } + content += "

Pyro Status PSS6: "; + switch (datalayer_extended.bmwix.pyro_status_pss6) { + case 0: + content += "0 Value Invalid

"; + break; + case 1: + content += "1 Successfully Blown"; + break; + case 2: + content += "2 Disconnected"; + break; + case 3: + content += "3 Not Activated - Pyro Intact"; + break; + case 4: + content += "4 Unknown"; + break; + default: + content += "Unknown"; + } return content; } diff --git a/Software/src/battery/BMW-PHEV-HTML.h b/Software/src/battery/BMW-PHEV-HTML.h index 812fd101..3b171d41 100644 --- a/Software/src/battery/BMW-PHEV-HTML.h +++ b/Software/src/battery/BMW-PHEV-HTML.h @@ -15,90 +15,203 @@ class BmwPhevHtmlRenderer : public BatteryHtmlRenderer { " dV"; content += "

Allowed Discharge Power: " + String(datalayer.battery.status.max_discharge_power_W) + " W

"; content += "

Allowed Charge Power: " + String(datalayer.battery.status.max_charge_power_W) + " W

"; - static const char* balanceText[5] = {"0 Balancing Inactive - Balancing not needed", "1 Balancing Active", - "2 Balancing Inactive - Cells not in rest break wait 10mins", - "3 Balancing Inactive", "4 Unknown"}; - content += "

Balancing: " + String((balanceText[datalayer_extended.bmwphev.balancing_status])) + "

"; - static const char* pyroText[5] = {"0 Value Invalid", "1 Successfully Blown", "2 Disconnected", - "3 Not Activated - Pyro Intact", "4 Unknown"}; - static const char* statusText[16] = { - "Not evaluated", "OK", "Error!", "Invalid signal", "", "", "", "", "", "", "", "", "", "", "", ""}; - content += "

Interlock: " + String(statusText[datalayer_extended.bmwphev.ST_interlock]) + "

"; - content += "

Isolation external: " + String(statusText[datalayer_extended.bmwphev.ST_iso_ext]) + "

"; - content += "

Isolation internal: " + String(statusText[datalayer_extended.bmwphev.ST_iso_int]) + "

"; - content += "

Isolation: " + String(statusText[datalayer_extended.bmwphev.ST_isolation]) + "

"; - content += "

Cooling valve: " + String(statusText[datalayer_extended.bmwphev.ST_valve_cooling]) + "

"; - content += "

Emergency: " + String(statusText[datalayer_extended.bmwphev.ST_EMG]) + "

"; - static const char* prechargeText[16] = {"Not evaluated", - "Not active, closing not blocked", - "Error precharge blocked", - "Invalid signal", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - ""}; - content += "

Precharge: " + String(prechargeText[datalayer_extended.bmwphev.ST_precharge]) + - "

"; //Still unclear of enum - static const char* DCSWText[16] = {"Contactors open", - "Precharge ongoing", - "Contactors engaged", - "Invalid signal", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - ""}; - content += "

Contactor status: " + String(DCSWText[datalayer_extended.bmwphev.ST_DCSW]) + "

"; - static const char* contText[16] = {"Contactors OK", - "One contactor welded!", - "Two contactors welded!", - "Invalid signal", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - ""}; - content += "

Contactor weld: " + String(contText[datalayer_extended.bmwphev.ST_WELD]) + "

"; - static const char* valveText[16] = {"OK", - "Short circuit to GND", - "Short circuit to 12V", - "Line break", - "", - "", - "Driver error", - "", - "", - "", - "", - "", - "Stuck", - "Stuck", - "", - "Invalid Signal"}; - content += - "

Cold shutoff valve: " + String(valveText[datalayer_extended.bmwphev.ST_cold_shutoff_valve]) + "

"; + content += "

Balancing: "; + switch (datalayer_extended.bmwphev.balancing_status) { + case 0: + content += String("0 Balancing Inactive - Balancing not needed

"); + break; + case 1: + content += String("1 Balancing Active"); + break; + case 2: + content += String("2 Balancing Inactive - Cells not in rest break wait 10mins"); + break; + case 3: + content += String("3 Balancing Inactive"); + break; + case 4: + content += String("4 Unknown"); + break; + default: + content += String("Unknown"); + } + content += "

Interlock: "; + switch (datalayer_extended.bmwphev.ST_interlock) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("OK"); + break; + case 2: + content += String("Error! Not seated!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Isolation external: "; + switch (datalayer_extended.bmwphev.ST_iso_ext) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("OK"); + break; + case 2: + content += String("Error!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Isolation internal: "; + switch (datalayer_extended.bmwphev.ST_iso_int) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("OK"); + break; + case 2: + content += String("Error!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Isolation: "; + switch (datalayer_extended.bmwphev.ST_isolation) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("OK"); + break; + case 2: + content += String("Error!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Cooling valve: "; + switch (datalayer_extended.bmwphev.ST_valve_cooling) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("OK"); + break; + case 2: + content += String("Error!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Emergency: "; + switch (datalayer_extended.bmwphev.ST_EMG) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("OK"); + break; + case 2: + content += String("Error!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Precharge: "; + switch (datalayer_extended.bmwphev.ST_precharge) { + case 0: + content += String("Not Evaluated

"); + break; + case 1: + content += String("Not active, closing not blocked"); + break; + case 2: + content += String("Error precharge blocked"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); //Still unclear of enum + } + content += "

Contactor status: "; + switch (datalayer_extended.bmwphev.ST_DCSW) { + case 0: + content += String("Contactors open

"); + break; + case 1: + content += String("Precharge ongoing"); + break; + case 2: + content += String("Contactors engaged"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Contactor weld: "; + switch (datalayer_extended.bmwphev.ST_WELD) { + case 0: + content += String("Contactors OK

"); + break; + case 1: + content += String("One contactor welded!"); + break; + case 2: + content += String("Two contactors welded!"); + break; + case 3: + content += String("Invalid signal"); + break; + default: + content += String("Unknown"); + } + content += "

Cold shutoff valve: "; + switch (datalayer_extended.bmwphev.ST_cold_shutoff_valve) { + case 0: + content += String("OK

"); + break; + case 1: + content += String("Short circuit to GND"); + break; + case 2: + content += String("Short circuit to 12V"); + break; + case 3: + content += String("Line break"); + break; + case 6: + content += String("Driver error"); + break; + case 12: + case 13: + content += String("Stuck"); + break; + default: + content += String("Invalid Signal"); + } content += "

Min Cell Voltage Data Age: " + String(datalayer_extended.bmwphev.min_cell_voltage_data_age) + " ms

"; content += diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp index df276871..d06529e1 100644 --- a/Software/src/battery/BYD-ATTO-3-BATTERY.cpp +++ b/Software/src/battery/BYD-ATTO-3-BATTERY.cpp @@ -21,12 +21,12 @@ After battery has been unlocked, you can remove the "USE_ESTIMATED_SOC" from the #define UNKNOWN_POLL_0 0x1FFE //0x64 19 C4 3B #define UNKNOWN_POLL_1 0x1FFC //0x72 1F C4 3B #define POLL_MAX_CHARGE_POWER 0x000A -#define UNKNOWN_POLL_3 0x000B //0x00B1 (177 interesting!) -#define UNKNOWN_POLL_4 0x000E //0x0B27 (2855 interesting!) -#define UNKNOWN_POLL_5 0x000F //0x00237B (9083 interesting!) -#define UNKNOWN_POLL_6 0x0010 //0x00231B (8987 interesting!) -#define UNKNOWN_POLL_7 0x0011 //0x0E4E (3662 interesting!) -#define UNKNOWN_POLL_8 0x0012 //0x0E27 (3623 interesting) +#define UNKNOWN_POLL_3 0x000B //0x00B1 (177 interesting!) +#define UNKNOWN_POLL_4 0x000E //0x0B27 (2855 interesting!) +#define POLL_TOTAL_CHARGED_AH 0x000F +#define POLL_TOTAL_DISCHARGED_AH 0x0010 +#define POLL_TOTAL_CHARGED_KWH 0x0011 +#define POLL_TOTAL_DISCHARGED_KWH 0x0012 #define UNKNOWN_POLL_9 0x0004 //0x0034 (52 interesting!) #define UNKNOWN_POLL_10 0x002A //0x5B #define UNKNOWN_POLL_11 0x002E //0x08 (probably module number, or cell number?) @@ -180,6 +180,9 @@ void BydAttoBattery:: datalayer_battery->status.cell_min_voltage_mV = BMS_lowest_cell_voltage_mV; + datalayer_battery->status.total_discharged_battery_Wh = BMS_total_discharged_kwh * 1000; + datalayer_battery->status.total_charged_battery_Wh = BMS_total_charged_kwh * 1000; + //Map all cell voltages to the global array memcpy(datalayer_battery->status.cell_voltages_mV, battery_cellvoltages, CELLCOUNT_EXTENDED * sizeof(uint16_t)); @@ -276,10 +279,10 @@ void BydAttoBattery:: datalayer_bydatto->chargePower = BMS_allowed_charge_power; datalayer_bydatto->unknown3 = BMS_unknown3; datalayer_bydatto->unknown4 = BMS_unknown4; - datalayer_bydatto->unknown5 = BMS_unknown5; - datalayer_bydatto->unknown6 = BMS_unknown6; - datalayer_bydatto->unknown7 = BMS_unknown7; - datalayer_bydatto->unknown8 = BMS_unknown8; + datalayer_bydatto->total_charged_ah = BMS_total_charged_ah; + datalayer_bydatto->total_discharged_ah = BMS_total_discharged_ah; + datalayer_bydatto->total_charged_kwh = BMS_total_charged_kwh; + datalayer_bydatto->total_discharged_kwh = BMS_total_discharged_kwh; datalayer_bydatto->unknown9 = BMS_unknown9; datalayer_bydatto->unknown10 = BMS_unknown10; datalayer_bydatto->unknown11 = BMS_unknown11; @@ -442,17 +445,17 @@ void BydAttoBattery::handle_incoming_can_frame(CAN_frame rx_frame) { case UNKNOWN_POLL_4: BMS_unknown4 = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; break; - case UNKNOWN_POLL_5: - BMS_unknown5 = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; + case POLL_TOTAL_CHARGED_AH: + BMS_total_charged_ah = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; break; - case UNKNOWN_POLL_6: - BMS_unknown6 = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; + case POLL_TOTAL_DISCHARGED_AH: + BMS_total_discharged_ah = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; break; - case UNKNOWN_POLL_7: - BMS_unknown7 = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; + case POLL_TOTAL_CHARGED_KWH: + BMS_total_charged_kwh = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; break; - case UNKNOWN_POLL_8: - BMS_unknown8 = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; + case POLL_TOTAL_DISCHARGED_KWH: + BMS_total_discharged_kwh = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; break; case UNKNOWN_POLL_9: BMS_unknown9 = (rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]; @@ -622,26 +625,26 @@ void BydAttoBattery::transmit_can(unsigned long currentMillis) { case UNKNOWN_POLL_4: ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((UNKNOWN_POLL_4 & 0xFF00) >> 8); ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(UNKNOWN_POLL_4 & 0x00FF); - poll_state = UNKNOWN_POLL_5; + poll_state = POLL_TOTAL_CHARGED_AH; break; - case UNKNOWN_POLL_5: - ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((UNKNOWN_POLL_5 & 0xFF00) >> 8); - ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(UNKNOWN_POLL_5 & 0x00FF); - poll_state = UNKNOWN_POLL_6; + case POLL_TOTAL_CHARGED_AH: + ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((POLL_TOTAL_CHARGED_AH & 0xFF00) >> 8); + ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(POLL_TOTAL_CHARGED_AH & 0x00FF); + poll_state = POLL_TOTAL_DISCHARGED_AH; break; - case UNKNOWN_POLL_6: - ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((UNKNOWN_POLL_6 & 0xFF00) >> 8); - ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(UNKNOWN_POLL_6 & 0x00FF); - poll_state = UNKNOWN_POLL_7; + case POLL_TOTAL_DISCHARGED_AH: + ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((POLL_TOTAL_DISCHARGED_AH & 0xFF00) >> 8); + ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(POLL_TOTAL_DISCHARGED_AH & 0x00FF); + poll_state = POLL_TOTAL_CHARGED_KWH; break; - case UNKNOWN_POLL_7: - ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((UNKNOWN_POLL_7 & 0xFF00) >> 8); - ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(UNKNOWN_POLL_7 & 0x00FF); - poll_state = UNKNOWN_POLL_8; + case POLL_TOTAL_CHARGED_KWH: + ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((POLL_TOTAL_CHARGED_KWH & 0xFF00) >> 8); + ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(POLL_TOTAL_CHARGED_KWH & 0x00FF); + poll_state = POLL_TOTAL_DISCHARGED_KWH; break; - case UNKNOWN_POLL_8: - ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((UNKNOWN_POLL_8 & 0xFF00) >> 8); - ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(UNKNOWN_POLL_8 & 0x00FF); + case POLL_TOTAL_DISCHARGED_KWH: + ATTO_3_7E7_POLL.data.u8[2] = (uint8_t)((POLL_TOTAL_DISCHARGED_KWH & 0xFF00) >> 8); + ATTO_3_7E7_POLL.data.u8[3] = (uint8_t)(POLL_TOTAL_DISCHARGED_KWH & 0x00FF); poll_state = UNKNOWN_POLL_9; break; case UNKNOWN_POLL_9: diff --git a/Software/src/battery/BYD-ATTO-3-BATTERY.h b/Software/src/battery/BYD-ATTO-3-BATTERY.h index dd55a527..5fdf102d 100644 --- a/Software/src/battery/BYD-ATTO-3-BATTERY.h +++ b/Software/src/battery/BYD-ATTO-3-BATTERY.h @@ -46,6 +46,7 @@ class BydAttoBattery : public CanBattery { static constexpr char* Name = "BYD Atto 3"; + bool supports_charged_energy() { return true; } bool supports_reset_crash() { return true; } void reset_crash() { datalayer_bydatto->UserRequestCrashReset = true; } @@ -117,10 +118,10 @@ class BydAttoBattery : public CanBattery { uint16_t BMS_allowed_charge_power = 0; uint16_t BMS_unknown3 = 0; uint16_t BMS_unknown4 = 0; - uint16_t BMS_unknown5 = 0; - uint16_t BMS_unknown6 = 0; - uint16_t BMS_unknown7 = 0; - uint16_t BMS_unknown8 = 0; + uint16_t BMS_total_charged_ah = 0; + uint16_t BMS_total_discharged_ah = 0; + uint16_t BMS_total_charged_kwh = 0; + uint16_t BMS_total_discharged_kwh = 0; uint16_t BMS_unknown9 = 0; uint8_t BMS_unknown10 = 0; uint8_t BMS_unknown11 = 0; diff --git a/Software/src/battery/BYD-ATTO-3-HTML.h b/Software/src/battery/BYD-ATTO-3-HTML.h index b133db84..2a344522 100644 --- a/Software/src/battery/BYD-ATTO-3-HTML.h +++ b/Software/src/battery/BYD-ATTO-3-HTML.h @@ -34,10 +34,10 @@ class BydAtto3HtmlRenderer : public BatteryHtmlRenderer { content += "

Charge power raw: " + String(byd_datalayer->chargePower) + "

"; content += "

Unknown3: " + String(byd_datalayer->unknown3) + "

"; content += "

Unknown4: " + String(byd_datalayer->unknown4) + "

"; - content += "

Unknown5: " + String(byd_datalayer->unknown5) + "

"; - content += "

Unknown6: " + String(byd_datalayer->unknown6) + "

"; - content += "

Unknown7: " + String(byd_datalayer->unknown7) + "

"; - content += "

Unknown8: " + String(byd_datalayer->unknown8) + "

"; + content += "

Total charged Ah: " + String(byd_datalayer->total_charged_ah) + "

"; + content += "

Total discharged Ah: " + String(byd_datalayer->total_discharged_ah) + "

"; + content += "

Total charged kWh: " + String(byd_datalayer->total_charged_kwh) + "

"; + content += "

Total discharged kWh: " + String(byd_datalayer->total_discharged_kwh) + "

"; content += "

Unknown9: " + String(byd_datalayer->unknown9) + "

"; content += "

Unknown10: " + String(byd_datalayer->unknown10) + "

"; content += "

Unknown11: " + String(byd_datalayer->unknown11) + "

"; diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp index f0c2a7cc..1e6e1521 100644 --- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp +++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp @@ -111,21 +111,18 @@ void KiaHyundai64Battery:: } void KiaHyundai64Battery::update_number_of_cells() { - //If we have cell values and number_of_cells not initialized yet - if (cellvoltages_mv[0] > 0 && datalayer_battery->info.number_of_cells == 0) { - // Check if we have 98S or 90S battery. If the 98th cell is valid range, we are on a 98S battery - if ((datalayer_battery->status.cell_voltages_mV[97] > 2000) && - (datalayer_battery->status.cell_voltages_mV[97] < 4300)) { - datalayer_battery->info.number_of_cells = 98; - datalayer_battery->info.max_design_voltage_dV = MAX_PACK_VOLTAGE_98S_DV; - datalayer_battery->info.min_design_voltage_dV = MIN_PACK_VOLTAGE_98S_DV; - datalayer_battery->info.total_capacity_Wh = 64000; - } else { - datalayer_battery->info.number_of_cells = 90; - datalayer_battery->info.max_design_voltage_dV = MAX_PACK_VOLTAGE_90S_DV; - datalayer_battery->info.min_design_voltage_dV = MIN_PACK_VOLTAGE_90S_DV; - datalayer_battery->info.total_capacity_Wh = 40000; - } + // Check if we have 98S or 90S battery. If the 98th cell is valid range, we are on a 98S battery + if ((datalayer_battery->status.cell_voltages_mV[97] > 2000) && + (datalayer_battery->status.cell_voltages_mV[97] < 4500)) { + datalayer_battery->info.number_of_cells = 98; + datalayer_battery->info.max_design_voltage_dV = MAX_PACK_VOLTAGE_98S_DV; + datalayer_battery->info.min_design_voltage_dV = MIN_PACK_VOLTAGE_98S_DV; + datalayer_battery->info.total_capacity_Wh = 64000; + } else { + datalayer_battery->info.number_of_cells = 90; + datalayer_battery->info.max_design_voltage_dV = MAX_PACK_VOLTAGE_90S_DV; + datalayer_battery->info.min_design_voltage_dV = MIN_PACK_VOLTAGE_90S_DV; + datalayer_battery->info.total_capacity_Wh = 40000; } } @@ -364,16 +361,18 @@ void KiaHyundai64Battery::handle_incoming_can_frame(CAN_frame rx_frame) { } break; case 0x26: //Sixth datarow in PID group - //We have read all cells, check that content is valid: - for (uint8_t i = 85; i < 97; ++i) { - if (cellvoltages_mv[i] < 300) { // Zero the value if it's below 300 - cellvoltages_mv[i] = 0; // Some packs incorrectly report the last unpopulated cells as 20-60mV + if (poll_data_pid == 5) { + //We have read all cells, check that content is valid: + for (uint8_t i = 85; i < 97; ++i) { + if (cellvoltages_mv[i] < 300) { // Zero the value if it's below 300 + cellvoltages_mv[i] = 0; // Some packs incorrectly report the last unpopulated cells as 20-60mV + } } + //Map all cell voltages to the global array + memcpy(datalayer_battery->status.cell_voltages_mV, cellvoltages_mv, 98 * sizeof(uint16_t)); + //Update number of cells + update_number_of_cells(); } - //Map all cell voltages to the global array - memcpy(datalayer_battery->status.cell_voltages_mV, cellvoltages_mv, 98 * sizeof(uint16_t)); - //Update number of cells - update_number_of_cells(); break; case 0x27: //Seventh datarow in PID group if (poll_data_pid == 1) { diff --git a/Software/src/battery/MEB-HTML.h b/Software/src/battery/MEB-HTML.h index 401236fd..20363276 100644 --- a/Software/src/battery/MEB-HTML.h +++ b/Software/src/battery/MEB-HTML.h @@ -20,119 +20,119 @@ class MebHtmlRenderer : public BatteryHtmlRenderer { content += "

HVIL status: "; switch (datalayer_extended.meb.HVIL) { case 0: - content += String("Init"); + content += "Init"; break; case 1: - content += String("Closed"); + content += "Closed"; break; case 2: - content += String("Open!"); + content += "Open!"; break; case 3: - content += String("Fault"); + content += "Fault"; break; default: - content += String("?"); + content += "?"; } content += "

KL30C status: "; switch (datalayer_extended.meb.BMS_Kl30c_Status) { case 0: - content += String("Init"); + content += "Init"; break; case 1: - content += String("Closed"); + content += "Closed"; break; case 2: - content += String("Open!"); + content += "Open!"; break; case 3: - content += String("Fault"); + content += "Fault"; break; default: - content += String("?"); + content += "?"; } content += "

BMS mode: "; switch (datalayer_extended.meb.BMS_mode) { case 0: - content += String("HV inactive"); + content += "HV inactive"; break; case 1: - content += String("HV active"); + content += "HV active"; break; case 2: - content += String("Balancing"); + content += "Balancing"; break; case 3: - content += String("Extern charging"); + content += "Extern charging"; break; case 4: - content += String("AC charging"); + content += "AC charging"; break; case 5: - content += String("Battery error"); + content += "Battery error"; break; case 6: - content += String("DC charging"); + content += "DC charging"; break; case 7: - content += String("Init"); + content += "Init"; break; default: - content += String("?"); + content += "?"; } content += String("

Charging: ") + (datalayer_extended.meb.charging_active ? "active" : "not active"); content += String("

Balancing: "); switch (datalayer_extended.meb.balancing_active) { case 0: - content += String("init"); + content += "init"; break; case 1: - content += String("active"); + content += "active"; break; case 2: - content += String("inactive"); + content += "inactive"; break; default: - content += String("?"); + content += "?"; } content += String("

Slow charging: ") + (datalayer_extended.meb.balancing_request ? "requested" : "not requested"); content += "

Diagnostic: "; switch (datalayer_extended.meb.battery_diagnostic) { case 0: - content += String("Init"); + content += "Init"; break; case 1: - content += String("Battery display"); + content += "Battery display"; break; case 4: - content += String("Battery display OK"); + content += "Battery display OK"; break; case 6: - content += String("Battery display check"); + content += "Battery display check"; break; case 7: - content += String("Fault"); + content += "Fault"; break; default: - content += String("?"); + content += "?"; } content += "

HV line status: "; switch (datalayer_extended.meb.status_HV_line) { case 0: - content += String("Init"); + content += "Init"; break; case 1: - content += String("No open HV line detected"); + content += "No open HV line detected"; break; case 2: - content += String("Open HV line"); + content += "Open HV line"; break; case 3: - content += String("Fault"); + content += "Fault"; break; default: - content += String("? ") + String(datalayer_extended.meb.status_HV_line); + content += "? " + String(datalayer_extended.meb.status_HV_line); } content += "

"; content += datalayer_extended.meb.BMS_fault_performance ? "

BMS fault performance: Active!

" @@ -147,83 +147,83 @@ class MebHtmlRenderer : public BatteryHtmlRenderer { content += "

Welded contactors: "; switch (datalayer_extended.meb.BMS_welded_contactors_status) { case 0: - content += String("Init"); + content += "Init"; break; case 1: - content += String("No contactor welded"); + content += "No contactor welded"; break; case 2: - content += String("At least 1 contactor welded"); + content += "At least 1 contactor welded"; break; case 3: - content += String("Protection status detection error"); + content += "Protection status detection error"; break; default: - content += String("?"); + content += "?"; } content += "

Warning support: "; switch (datalayer_extended.meb.warning_support) { case 0: - content += String("OK"); + content += "OK"; break; case 1: - content += String("Not OK"); + content += "Not OK"; break; case 6: - content += String("Init"); + content += "Init"; break; case 7: - content += String("Fault"); + content += "Fault"; break; default: - content += String("?"); + content += "?"; } content += "

Interm. Voltage (" + String(datalayer_extended.meb.BMS_voltage_intermediate_dV / 10.0, 1) + "V) status: "; switch (datalayer_extended.meb.BMS_status_voltage_free) { case 0: - content += String("Init"); + content += "Init"; break; case 1: - content += String("BMS interm circuit voltage free (U<20V)"); + content += "BMS interm circuit voltage free (U<20V)"; break; case 2: - content += String("BMS interm circuit not voltage free (U >= 25V)"); + content += "BMS interm circuit not voltage free (U >= 25V)"; break; case 3: - content += String("Error"); + content += "Error"; break; default: - content += String("?"); + content += "?"; } content += "

BMS error status: "; switch (datalayer_extended.meb.BMS_error_status) { case 0: - content += String("Component IO"); + content += "Component IO"; break; case 1: - content += String("Iso Error 1"); + content += "Iso Error 1"; break; case 2: - content += String("Iso Error 2"); + content += "Iso Error 2"; break; case 3: - content += String("Interlock"); + content += "Interlock"; break; case 4: - content += String("SD"); + content += "SD"; break; case 5: - content += String("Performance red"); + content += "Performance red"; break; case 6: - content += String("No component function"); + content += "No component function"; break; case 7: - content += String("Init"); + content += "Init"; break; default: - content += String("?"); + content += "?"; } content += "

BMS voltage: " + String(datalayer_extended.meb.BMS_voltage_dV / 10.0, 1) + "

"; content += datalayer_extended.meb.BMS_OBD_MIL ? "

OBD MIL: ON!

" : "

OBD MIL: Off

"; diff --git a/Software/src/battery/NISSAN-LEAF-HTML.h b/Software/src/battery/NISSAN-LEAF-HTML.h index 18aac585..4d21d4dd 100644 --- a/Software/src/battery/NISSAN-LEAF-HTML.h +++ b/Software/src/battery/NISSAN-LEAF-HTML.h @@ -10,8 +10,20 @@ class NissanLeafHtmlRenderer : public BatteryHtmlRenderer { String get_status_html() { String content; - static const char* LEAFgen[] = {"ZE0", "AZE0", "ZE1"}; - content += "

LEAF generation: " + String(LEAFgen[datalayer_extended.nissanleaf.LEAF_gen]) + "

"; + content += "

LEAF generation: "; + switch (datalayer_extended.nissanleaf.LEAF_gen) { + case 0: + content += String("ZE0

"); + break; + case 1: + content += String("AZE0"); + break; + case 2: + content += String("ZE1"); + break; + default: + content += String("Unknown"); + } char readableSerialNumber[16]; // One extra space for null terminator memcpy(readableSerialNumber, datalayer_extended.nissanleaf.BatterySerialNumber, sizeof(datalayer_extended.nissanleaf.BatterySerialNumber)); diff --git a/Software/src/datalayer/datalayer_extended.h b/Software/src/datalayer/datalayer_extended.h index b9456887..9c10deab 100644 --- a/Software/src/datalayer/datalayer_extended.h +++ b/Software/src/datalayer/datalayer_extended.h @@ -197,10 +197,10 @@ typedef struct { uint16_t chargePower = 0; uint16_t unknown3 = 0; uint16_t unknown4 = 0; - uint16_t unknown5 = 0; - uint16_t unknown6 = 0; - uint16_t unknown7 = 0; - uint16_t unknown8 = 0; + uint16_t total_charged_ah = 0; + uint16_t total_discharged_ah = 0; + uint16_t total_charged_kwh = 0; + uint16_t total_discharged_kwh = 0; uint16_t unknown9 = 0; uint8_t unknown10 = 0; uint8_t unknown11 = 0;