yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Factoring changes

Browse source
This commit is contained in:
josiahhiggs 2024-12-22 18:35:48 +13:00
parent 6d96808de4
commit ad215a0a06
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Software/src/battery/TESLA-BATTERY.cpp
View file

@ -48,7 +48,7 @@ static uint16_t battery_nominal_full_pack_energy_m0 = 600; // Kwh
//0x132 306 HVBattAmpVolt //0x132 306 HVBattAmpVolt
static uint16_t battery_volts = 0; // V static uint16_t battery_volts = 0; // V
static int16_t battery_amps = 0; // A static int16_t battery_amps = 0; // A
static int16_t battery_raw_amps = 0; // A static int16_t battery_raw_amps = 0; // A
static uint16_t battery_charge_time_remaining = 0; // Minutes static uint16_t battery_charge_time_remaining = 0; // Minutes
//0x252 594 BMS_powerAvailable //0x252 594 BMS_powerAvailable
static uint16_t BMS_maxRegenPower = 0; //rename from battery_regenerative_limit static uint16_t BMS_maxRegenPower = 0; //rename from battery_regenerative_limit
@ -432,7 +432,7 @@ static uint16_t battery2_nominal_full_pack_energy_m0 = 600; // Kwh
//0x132 306 HVBattAmpVolt //0x132 306 HVBattAmpVolt
static uint16_t battery2_volts = 0; // V static uint16_t battery2_volts = 0; // V
static int16_t battery2_amps = 0; // A static int16_t battery2_amps = 0; // A
static int16_t battery2_raw_amps = 0; // A static int16_t battery2_raw_amps = 0; // A
static uint16_t battery2_charge_time_remaining = 0; // Minutes static uint16_t battery2_charge_time_remaining = 0; // Minutes
//0x252 594 BMS_powerAvailable //0x252 594 BMS_powerAvailable
static uint16_t BMS2_regenerative_limit = 0; static uint16_t BMS2_regenerative_limit = 0;

3
Software/src/devboard/webserver/advanced_battery_html.cpp
View file

@ -571,8 +571,7 @@ String advanced_battery_processor(const String& var) {
content += content +=
"<h4>Full Charge Complete: " + String(noYes[datalayer_extended.tesla.battery_full_charge_complete]) + "</h4>"; "<h4>Full Charge Complete: " + String(noYes[datalayer_extended.tesla.battery_full_charge_complete]) + "</h4>";
//0x352 850 BMS_energyStatus //0x352 850 BMS_energyStatus
content += content += "<h3>Late BMS 0x352 with Mux:</h3>"; //if using newer BMS >2021 and comment 0x352 with MUX
"<h3>Late BMS 0x352 with Mux:</h3>"; //if using newer BMS >2021 and comment 0x352 with MUX
content += "<h4>Calculated SOH: " + String(nominal_full_pack_energy_m0 * 100 / beginning_of_life) + "</h4>"; content += "<h4>Calculated SOH: " + String(nominal_full_pack_energy_m0 * 100 / beginning_of_life) + "</h4>";
content += "<h4>Nominal Full Pack Energy: " + String(nominal_full_pack_energy_m0) + " KWh</h4>"; content += "<h4>Nominal Full Pack Energy: " + String(nominal_full_pack_energy_m0) + " KWh</h4>";
content += "<h4>Nominal Energy Remaining: " + String(nominal_energy_remaining_m0) + " KWh</h4>"; content += "<h4>Nominal Energy Remaining: " + String(nominal_energy_remaining_m0) + " KWh</h4>";