From f55cad92f1cb32fdf2df863413eb58504b91b03c Mon Sep 17 00:00:00 2001 From: josiahhiggs <79869367+josiahhiggs@users.noreply.github.com> Date: Sun, 22 Dec 2024 16:29:06 +1300 Subject: [PATCH] Update advanced_battery_html.cpp --- .../webserver/advanced_battery_html.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp index fbb2f29e..e457f6bf 100644 --- a/Software/src/devboard/webserver/advanced_battery_html.cpp +++ b/Software/src/devboard/webserver/advanced_battery_html.cpp @@ -468,14 +468,16 @@ String advanced_battery_processor(const String& var) { content += "

Pyrotest in Progress: " + String(falseTrue[datalayer_extended.tesla.pyroTestInProgress]) + "

"; content += "

Contactors Open Now Requested: " + String(noYes[datalayer_extended.tesla.battery_packCtrsOpenNowRequested]) + "

"; - content += "

Contactors Open Requested: " + - String(noYes[datalayer_extended.tesla.battery_packCtrsOpenRequested]) + "

"; + content += + "

Contactors Open Requested: " + String(noYes[datalayer_extended.tesla.battery_packCtrsOpenRequested]) + + "

"; content += "

Contactors Request Status: " + String(HVP_contactor[datalayer_extended.tesla.battery_packCtrsRequestStatus]) + "

"; content += "

Contactors Reset Request Required: " + String(noYes[datalayer_extended.tesla.battery_packCtrsResetRequestRequired]) + "

"; - content += "

DC Link Allowed to Energize:" + - String(noYes[datalayer_extended.tesla.battery_dcLinkAllowedToEnergize]) + "

"; + content += + "

DC Link Allowed to Energize:" + String(noYes[datalayer_extended.tesla.battery_dcLinkAllowedToEnergize]) + + "

"; // Comment what data you would like to dislay, order can be changed. //0x292 658 BMS_socStates content += "

Battery Beginning of Life: " + String(beginning_of_life) + " KWh

"; @@ -559,7 +561,9 @@ String advanced_battery_processor(const String& var) { content += "

BMS PCS PWM Enabled: " + String(noYes[datalayer_extended.tesla.battery_BMS_pcsPwmEnabled]) + "

"; //0x352 850 BMS_energyStatus - content += "

Early BMS 0x352:""Early BMS 0x352:" + ""; content += "

Nominal Energy Remaining: " + String(nominal_energy_remaining) + " KWh

"; @@ -569,7 +573,9 @@ String advanced_battery_processor(const String& var) { content += "

Full Charge Complete: " + String(noYes[datalayer_extended.tesla.battery_full_charge_complete]) + "

"; //0x352 850 BMS_energyStatus - content += "

Late BMS 0x352 with Mux:""2021 and comment 0x352 with MUX + content += + "

Late BMS 0x352 with Mux:" + "2021 and comment 0x352 with MUX content += "

Calculated SOH: " + String(nominal_full_pack_energy_m0) * 100 / (beginning_of_life); content += "

Nominal Full Pack Energy: " + String(nominal_full_pack_energy_m0) + " KWh

"; content += "

Nominal Energy Remaining: " + String(nominal_energy_remaining_m0) + " KWh

";