From 5dd30f7d33cf97cfd3ea8983572f08f743b63f1d Mon Sep 17 00:00:00 2001
From: wjcloudy <56305354+wjcloudy@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:55:07 +0000
Subject: [PATCH] Update advanced_battery_html.cpp
---
.../webserver/advanced_battery_html.cpp | 41 +++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp
index 5e6557e8..ddad0304 100644
--- a/Software/src/devboard/webserver/advanced_battery_html.cpp
+++ b/Software/src/devboard/webserver/advanced_battery_html.cpp
@@ -16,6 +16,47 @@ String advanced_battery_processor(const String& var) {
// Start a new block with a specific background color
content += "
";
+#ifdef BMW_IX_BATTERY
+ content += "
Battery Voltage after Contactor: " + String(datalayer_extended.bmwix.battery_voltage_after_contactor) + " dV
";
+ content += "Max Design Voltage: " + String(datalayer.battery.info.max_design_voltage_dV) + " dV
";
+ content += "Min Design Voltage: " + String(datalayer.battery.info.min_design_voltage_dV) + " dV
";
+ content += "Max Cell Design Voltage: " + String(datalayer.battery.info.max_cell_voltage_mV) + " mV
";
+ content += "Min Cell Design Voltage: " + String(datalayer.battery.info.min_cell_voltage_mV) + " mV
";
+ content += "Min Cell Voltage Data Age: " + String(datalayer_extended.bmwix.min_cell_voltage_data_age) + " ms
";
+ content += "Max Cell Voltage Data Age: " + String(datalayer_extended.bmwix.max_cell_voltage_data_age) + " ms
";
+ 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
";
+ 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 += "BMS Uptime: " + String(datalayer_extended.bmwix.bms_uptime) + " seconds
";
+ content += "BMS Allowed Charge Amps: " + String(datalayer_extended.bmwix.allowable_charge_amps) + " A
";
+ content += "BMS Allowed Disharge Amps: " + String(datalayer_extended.bmwix.allowable_discharge_amps) + " A
";
+ content += "
";
+ content += "HV Isolation (2147483647kOhm = maximum/invalid)
";
+ 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])) + "
";
+#endif //BMW_IX_BATTERY
+
#ifdef BMW_I3_BATTERY
content += "SOC raw: " + String(datalayer_extended.bmwi3.SOC_raw) + "
";
content += "SOC dash: " + String(datalayer_extended.bmwi3.SOC_dash) + "
";