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

Update TESLA-BATTERY.cpp

Browse source 
merge conflicts and compile fix
This commit is contained in:
josiahhiggs 2024-12-30 07:52:11 +13:00
parent baf90931bd
commit 06a1eb061e
1 changed files with 14 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,50 +27,24 @@ static uint16_t sendContactorClosingMessagesStill = 300;
static uint16_t battery_cell_max_v = 3300;
static uint16_t battery_cell_min_v = 3300;
static uint16_t battery_cell_deviation_mV = 0; //contains the deviation between highest and lowest cell in mV
static bool cellvoltagesRead = false;
//0x3d2: 978 BMS_kwhCounter
static uint32_t battery_total_discharge = 0;
static uint32_t battery_total_charge = 0;
static uint16_t battery_volts = 0; // V
static int16_t battery_amps = 0; // A
static uint16_t battery_raw_amps = 0; // A
static int16_t battery_max_temp = 0; // C*
static int16_t battery_min_temp = 0; // C*
static uint16_t battery_energy_buffer = 0; // kWh
static uint16_t battery_energy_buffer_m1 = 0; // kWh
static uint16_t battery_energy_to_charge_complete = 0; // kWh
static uint16_t battery_energy_to_charge_complete_m1 = 0; // kWh
static uint16_t battery_expected_energy_remaining = 0; // kWh
static uint16_t battery_expected_energy_remaining_m1 = 0; // kWh
static uint8_t battery_full_charge_complete = 0; // kWh
static uint8_t battery_fully_charged = 0; // kWh
static uint16_t battery_ideal_energy_remaining = 0; // kWh
static uint16_t battery_ideal_energy_remaining_m0 = 0; // kWh
static uint16_t battery_nominal_energy_remaining = 0; // kWh
static uint16_t battery_nominal_energy_remaining_m0 = 0; // kWh
static uint16_t battery_nominal_full_pack_energy = 0; // Kwh
static uint16_t battery_nominal_full_pack_energy_m0 = 0; // Kwh
static uint16_t battery_beginning_of_life = 0; // kWh
static uint16_t battery_charge_time_remaining = 0; // Minutes
static uint16_t battery_regenerative_limit = 0;
static uint16_t battery_discharge_limit = 0;
static uint16_t battery_max_heat_park = 0;
static uint16_t battery_hvac_max_power = 0;
//0x352: 850 BMS_energyStatus
static uint16_t battery_energy_buffer = 0; // kWh
static uint16_t battery_energy_buffer_m1 = 0; // kWh
static uint16_t battery_energy_to_charge_complete = 0; // kWh
static uint16_t battery_energy_to_charge_complete_m1 = 0; // kWh
static uint16_t battery_expected_energy_remaining = 0; // kWh
static uint16_t battery_expected_energy_remaining_m1 = 0; // kWh
static bool battery_full_charge_complete = false; // Changed to bool
static bool battery_fully_charged = false; // Changed to bool
static uint16_t battery_ideal_energy_remaining = 0; // kWh
static uint16_t battery_ideal_energy_remaining_m0 = 0; // kWh
static uint16_t battery_nominal_energy_remaining = 0; // kWh
static uint16_t battery_nominal_energy_remaining_m0 = 0; // kWh
static uint16_t battery_nominal_full_pack_energy = 0; // Kwh
static uint16_t battery_nominal_full_pack_energy_m0 = 0; // Kwh
static uint16_t battery_energy_buffer = 0; // kWh
static uint16_t battery_energy_buffer_m1 = 0; // kWh
static uint16_t battery_energy_to_charge_complete = 0; // kWh
static uint16_t battery_energy_to_charge_complete_m1 = 0; // kWh
static uint16_t battery_expected_energy_remaining = 0; // kWh
static uint16_t battery_expected_energy_remaining_m1 = 0; // kWh
static bool battery_full_charge_complete = false; // Changed to bool
static bool battery_fully_charged = false; // Changed to bool
static uint16_t battery_ideal_energy_remaining = 0; // kWh
static uint16_t battery_ideal_energy_remaining_m0 = 0; // kWh
static uint16_t battery_nominal_energy_remaining = 0; // kWh
static uint16_t battery_nominal_energy_remaining_m0 = 0; // kWh
static uint16_t battery_nominal_full_pack_energy = 0; // Kwh
static uint16_t battery_nominal_full_pack_energy_m0 = 0; // Kwh
//0x132 306 HVBattAmpVolt
static uint16_t battery_volts = 0; // V
static int16_t battery_amps = 0; // A
@ -100,18 +74,6 @@ static uint16_t battery_soc_min = 0;
static uint16_t battery_soc_max = 0;
static uint16_t battery_soc_ui = 0; //Change name from battery_soc_vi to reflect DBC battery_soc_ui
static uint16_t battery_soc_ave = 0;
static uint16_t battery_cell_max_v = 3300; //Voltage value used on boot before CAN values have been mapped
static uint16_t battery_cell_min_v = 3300; //Changed from 3700
static uint16_t battery_cell_deviation_mV = 0; //contains the deviation between highest and lowest cell in mV
static uint8_t battery_max_vno = 0;
static uint8_t battery_min_vno = 0;
static uint8_t battery_contactor = 0; //State of contactor
static uint8_t battery_hvil_status = 0;
static uint8_t battery_packContNegativeState = 0;
static uint8_t battery_packContPositiveState = 0;
static uint8_t battery_packContactorSetState = 0;
static uint8_t battery_packCtrsClosingAllowed = 0;
static uint8_t battery_pyroTestInProgress = 0;
static uint8_t battery_battTempPct = 0;
//0x392: BMS_packConfig
static uint32_t battery_packMass = 0;
@ -449,7 +411,6 @@ static bool battery_BMS_a180_SW_ECU_reset_blocked = false;
static uint16_t battery2_cell_max_v = 3300;
static uint16_t battery2_cell_min_v = 3300;
static uint16_t battery2_cell_deviation_mV = 0; //contains the deviation between highest and lowest cell in mV
static bool battery2_cellvoltagesRead = false;
//0x3d2: 978 BMS_kwhCounter
static uint32_t battery2_total_discharge = 0;
static uint32_t battery2_total_charge = 0;
@ -468,8 +429,6 @@ static uint16_t battery2_nominal_energy_remaining = 0;
static uint16_t battery2_nominal_energy_remaining_m0 = 0; // kWh
static uint16_t battery2_nominal_full_pack_energy = 0;
static uint16_t battery2_nominal_full_pack_energy_m0 = 0; // Kwh
static uint16_t battery2_nominal_full_pack_energy = 0;
static uint16_t battery2_nominal_full_pack_energy_m0 = 0; // Kwh
//0x132 306 HVBattAmpVolt
static uint16_t battery2_volts = 0; // V
static int16_t battery2_amps = 0; // A
@ -498,18 +457,6 @@ static uint16_t battery2_soc_min = 0;
static uint16_t battery2_soc_max = 0;
static uint16_t battery2_soc_ui = 0;
static uint16_t battery2_soc_ave = 0;
static uint16_t battery2_cell_max_v = 3300;
static uint16_t battery2_cell_min_v = 3300;
static uint16_t battery2_cell_deviation_mV = 0; //contains the deviation between highest and lowest cell in mV
static uint8_t battery2_max_vno = 0;
static uint8_t battery2_min_vno = 0;
static uint8_t battery2_contactor = 0; //State of contactor
static uint8_t battery2_hvil_status = 0;
static uint8_t battery2_packContNegativeState = 0;
static uint8_t battery2_packContPositiveState = 0;
static uint8_t battery2_packContactorSetState = 0;
static uint8_t battery2_packCtrsClosingAllowed = 0;
static uint8_t battery2_pyroTestInProgress = 0;
static uint8_t battery2_battTempPct = 0;
//0x392: BMS_packConfig
static uint32_t battery2_packMass = 0;