diff --git a/Software/src/devboard/webserver/advanced_battery_html.cpp b/Software/src/devboard/webserver/advanced_battery_html.cpp index c8fc14c3..fbb2f29e 100644 --- a/Software/src/devboard/webserver/advanced_battery_html.cpp +++ b/Software/src/devboard/webserver/advanced_battery_html.cpp @@ -333,8 +333,8 @@ String advanced_battery_processor(const String& var) { float isolationResistance = static_cast(datalayer_extended.tesla.battery_BMS_isolationResistance) * 10; float PCS_dcdcMaxOutputCurrentAllowed = static_cast(datalayer_extended.tesla.battery_PCS_dcdcMaxOutputCurrentAllowed) * 0.1; - float PCS_dcdcTemp = static_cast(datalayer_extended.tesla.PCS_dcdcTemp * 0.1 + 40); - float PCS_ambientTemp = static_cast(datalayer_extended.tesla.PCS_ambientTemp) * 0.1 + 40; + float PCS_dcdcTemp = static_cast(datalayer_extended.tesla.PCS_dcdcTemp) * 0.1 - 40; + float PCS_ambientTemp = static_cast(datalayer_extended.tesla.PCS_ambientTemp) * 0.1 - 40; float BMS_maxRegenPower = static_cast(datalayer_extended.tesla.BMS_maxRegenPower) * 0.01; float BMS_maxDischargePower = static_cast(datalayer_extended.tesla.BMS_maxDischargePower) * 0.013; float BMS_maxStationaryHeatPower = static_cast(datalayer_extended.tesla.BMS_maxStationaryHeatPower) * 0.01; @@ -346,8 +346,8 @@ String advanced_battery_processor(const String& var) { float BMS_inletPassiveTargetT = static_cast(datalayer_extended.tesla.BMS_inletPassiveTargetT) * 0.25 - 25; float BMS_inletActiveHeatTargetT = static_cast(datalayer_extended.tesla.BMS_inletActiveHeatTargetT) * 0.25 - 25; - float BMS_packTMin = static_cast(datalayer_extended.tesla.BMS_packTMin); - float BMS_packTMax = static_cast(datalayer_extended.tesla.BMS_packTMax); + float BMS_packTMin = static_cast(datalayer_extended.tesla.BMS_packTMin) * 0.25 - 25; + float BMS_packTMax = static_cast(datalayer_extended.tesla.BMS_packTMax) * 0.25 - 25; float PCS_dcdcMaxLvOutputCurrent = static_cast(datalayer_extended.tesla.PCS_dcdcMaxLvOutputCurrent) * 0.1; float PCS_dcdcCurrentLimit = static_cast(datalayer_extended.tesla.PCS_dcdcCurrentLimit) * 0.1; float PCS_dcdcLvOutputCurrentTempLimit = @@ -454,6 +454,7 @@ String advanced_battery_processor(const String& var) { "NUM"}; static const char* BMS_powerLimitState[] = {"NOT_CALCULATED_FOR_DRIVE", "CALCULATED_FOR_DRIVE"}; static const char* HVP_status[] = {"INVALID", "NOT_AVAILABLE", "STALE", "VALID"}; + static const char* HVP_contactor[] = {"NOT_ACTIVE", "ACTIVE", "COMPLETED"}; static const char* falseTrue[] = {"False", "True"}; static const char* noYes[] = {"No", "Yes"}; //0x20A 522 HVP_contatorState @@ -466,15 +467,15 @@ String advanced_battery_processor(const String& var) { content += "

Closing allowed?: " + String(falseTrue[datalayer_extended.tesla.packCtrsClosingAllowed]) + "

"; content += "

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

"; content += "

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

"; - content += "

Contactors Open Requested; " + - String(falseTrue[datalayer_extended.tesla.battery_packCtrsOpenRequested]) + "

"; - content += "

Contactors Request Status; " + - String(falseTrue[datalayer_extended.tesla.battery_packCtrsRequestStatus]) + "

"; - content += "

Contactors Reset Request Required; " + - String(falseTrue[datalayer_extended.tesla.battery_packCtrsResetRequestRequired]) + "

"; - content += "

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

"; + String(noYes[datalayer_extended.tesla.battery_packCtrsOpenNowRequested]) + ""; + 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]) + "

"; // 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

"; @@ -558,7 +559,8 @@ 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"; content += "

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

"; content += "

Ideal Energy Remaining: " + String(ideal_energy_remaining) + " KWh

"; @@ -567,7 +569,8 @@ 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 Mux2021 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

"; content += "

Ideal Energy Remaining: " + String(ideal_energy_remaining_m0) + " KWh

"; @@ -600,7 +603,7 @@ String advanced_battery_processor(const String& var) { content += "

HVAC Power Budget: " + String(BMS_hvacPowerBudget) + " KW

"; content += "

Not Enough Power For Heat Pump: " + String(noYes[datalayer_extended.tesla.BMS_notEnoughPowerForHeatPump]) + - " KW

"; + ""; content += "

Power Limit State: " + String(BMS_powerLimitState[datalayer_extended.tesla.BMS_powerLimitState]) + "

"; content += "

Inverter TQF: " + String(datalayer_extended.tesla.BMS_inverterTQF) + "

";