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

Pre-commit fix

Browse source
This commit is contained in:
Daniel Öster 2024-09-08 22:12:57 +03:00
parent fca78bef78
commit 373d7a4f0f
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Software/src/battery/BATTERIES.h
View file

@ -62,7 +62,8 @@
#include "SANTA-FE-PHEV-BATTERY.h" #include "SANTA-FE-PHEV-BATTERY.h"
#endif #endif
#if defined(TESLA_MODEL_S_BATTERY) || defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_X_BATTERY) || defined(TESLA_MODEL_Y_BATTERY) #if defined(TESLA_MODEL_S_BATTERY) || defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_X_BATTERY) || \
defined(TESLA_MODEL_Y_BATTERY)
#include "TESLA-BATTERY.h" #include "TESLA-BATTERY.h"
#endif #endif

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

@ -327,14 +327,14 @@ void update_values_battery() { //This function maps all the values fetched via
battery_cell_deviation_mV = (battery_cell_max_v - battery_cell_min_v); battery_cell_deviation_mV = (battery_cell_max_v - battery_cell_min_v);
#if defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_Y_BATTERY) #if defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_Y_BATTERY)
// Autodetect algoritm for chemistry on 3/Y packs. // Autodetect algoritm for chemistry on 3/Y packs.
// NCM/A batteries have 96s, LFP has 102-106s // NCM/A batteries have 96s, LFP has 102-106s
// Drawback with this check is that it takes 3-5minutes before all cells have been counted! // Drawback with this check is that it takes 3-5minutes before all cells have been counted!
if (datalayer.battery.info.number_of_cells > 101) { if (datalayer.battery.info.number_of_cells > 101) {
datalayer.battery.info.chemistry = battery_chemistry_enum::LFP; datalayer.battery.info.chemistry = battery_chemistry_enum::LFP;
} }
#endif // TESLA_MODEL_3_BATTERY || TESLA_MODEL_Y_BATTERY #endif // TESLA_MODEL_3_BATTERY || TESLA_MODEL_Y_BATTERY
//Once cell chemistry is determined, set maximum and minimum total pack voltage safety limits //Once cell chemistry is determined, set maximum and minimum total pack voltage safety limits
if (datalayer.battery.info.chemistry == battery_chemistry_enum::LFP) { if (datalayer.battery.info.chemistry == battery_chemistry_enum::LFP) {
@ -909,14 +909,14 @@ void update_values_battery2() { //This function maps all the values fetched via
battery2_cell_deviation_mV = (battery2_cell_max_v - battery2_cell_min_v); battery2_cell_deviation_mV = (battery2_cell_max_v - battery2_cell_min_v);
#if defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_Y_BATTERY) #if defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_Y_BATTERY)
// Autodetect algoritm for chemistry on 3/Y packs. // Autodetect algoritm for chemistry on 3/Y packs.
// NCM/A batteries have 96s, LFP has 102-106s // NCM/A batteries have 96s, LFP has 102-106s
// Drawback with this check is that it takes 3-5minutes before all cells have been counted! // Drawback with this check is that it takes 3-5minutes before all cells have been counted!
if (datalayer.battery2.info.number_of_cells > 101) { if (datalayer.battery2.info.number_of_cells > 101) {
datalayer.battery2.info.chemistry = battery_chemistry_enum::LFP; datalayer.battery2.info.chemistry = battery_chemistry_enum::LFP;
} }
#endif // TESLA_MODEL_3_BATTERY || TESLA_MODEL_Y_BATTERY #endif // TESLA_MODEL_3_BATTERY || TESLA_MODEL_Y_BATTERY
//Once cell chemistry is determined, set maximum and minimum total pack voltage safety limits //Once cell chemistry is determined, set maximum and minimum total pack voltage safety limits
if (datalayer.battery2.info.chemistry == battery_chemistry_enum::LFP) { if (datalayer.battery2.info.chemistry == battery_chemistry_enum::LFP) {
@ -1250,16 +1250,16 @@ void setup_battery(void) { // Performs one time setup at startup
datalayer.system.status.battery_allows_contactor_closing = true; datalayer.system.status.battery_allows_contactor_closing = true;
#if defined(TESLA_MODEL_S_BATTERY) || defined(TESLA_MODEL_X_BATTERY) // Always use NCM/A mode on S/X packs #if defined(TESLA_MODEL_S_BATTERY) || defined(TESLA_MODEL_X_BATTERY) // Always use NCM/A mode on S/X packs
datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_SX_NCMA; datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_SX_NCMA;
datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_SX_NCMA; datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_SX_NCMA;
#ifdef DOUBLE_BATTERY #ifdef DOUBLE_BATTERY
datalayer.battery2.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_SX_NCMA; datalayer.battery2.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_SX_NCMA;
datalayer.battery2.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_SX_NCMA; datalayer.battery2.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_SX_NCMA;
#endif // DOUBLE_BATTERY #endif // DOUBLE_BATTERY
#endif // TESLA_MODEL_S_BATTERY || TESLA_MODEL_X_BATTERY #endif // TESLA_MODEL_S_BATTERY || TESLA_MODEL_X_BATTERY
#if defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_Y_BATTERY) // Model 3/Y can be either LFP or NCM/A #if defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_Y_BATTERY) // Model 3/Y can be either LFP or NCM/A
#ifdef LFP_CHEMISTRY #ifdef LFP_CHEMISTRY
datalayer.battery.info.chemistry = battery_chemistry_enum::LFP; datalayer.battery.info.chemistry = battery_chemistry_enum::LFP;
datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_LFP; datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_LFP;
@ -1268,16 +1268,16 @@ void setup_battery(void) { // Performs one time setup at startup
datalayer.battery2.info.chemistry = battery_chemistry_enum::LFP; datalayer.battery2.info.chemistry = battery_chemistry_enum::LFP;
datalayer.battery2.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_LFP; datalayer.battery2.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_LFP;
datalayer.battery2.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_3Y_LFP; datalayer.battery2.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_3Y_LFP;
#endif // DOUBLE_BATTERY #endif // DOUBLE_BATTERY
#else // Startup in NCM/A mode #else // Startup in NCM/A mode
datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_NCMA; datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_NCMA;
datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_3Y_NCMA; datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_3Y_NCMA;
#ifdef DOUBLE_BATTERY #ifdef DOUBLE_BATTERY
datalayer.battery2.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_NCMA; datalayer.battery2.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_3Y_NCMA;
datalayer.battery2.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_3Y_NCMA; datalayer.battery2.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_3Y_NCMA;
#endif // DOUBLE_BATTERY #endif // DOUBLE_BATTERY
#endif // !LFP_CHEMISTRY #endif // !LFP_CHEMISTRY
#endif // TESLA_MODEL_3_BATTERY || TESLA_MODEL_Y_BATTERY #endif // TESLA_MODEL_3_BATTERY || TESLA_MODEL_Y_BATTERY
} }
#endif // TESLA_BATTERY #endif // TESLA_BATTERY

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

@ -526,7 +526,8 @@ String processor(const String& var) {
#ifdef SERIAL_LINK_RECEIVER #ifdef SERIAL_LINK_RECEIVER
content += "Serial link to another LilyGo board"; content += "Serial link to another LilyGo board";
#endif // SERIAL_LINK_RECEIVER #endif // SERIAL_LINK_RECEIVER
#if defined(TESLA_MODEL_S_BATTERY) || defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_X_BATTERY) || defined(TESLA_MODEL_Y_BATTERY) #if defined(TESLA_MODEL_S_BATTERY) || defined(TESLA_MODEL_3_BATTERY) || defined(TESLA_MODEL_X_BATTERY) || \
defined(TESLA_MODEL_Y_BATTERY)
content += "Tesla Model S/3/X/Y"; content += "Tesla Model S/3/X/Y";
#endif // TESLA_MODEL_#_BATTERY #endif // TESLA_MODEL_#_BATTERY
#ifdef VOLVO_SPA_BATTERY #ifdef VOLVO_SPA_BATTERY