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

Compile fix

Browse source
This commit is contained in:
Cabooman 2024-02-03 23:08:49 +01:00
parent 4f6829e591
commit 806fc6d1b8
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Software/src/battery/NISSAN-LEAF-BATTERY.h
View file

@ -27,6 +27,7 @@ extern uint16_t cell_max_voltage; //mV, 0-4350
extern uint16_t cell_min_voltage; //mV, 0-4350 extern uint16_t cell_min_voltage; //mV, 0-4350
extern uint8_t LEDcolor; //Enum, 0-10 extern uint8_t LEDcolor; //Enum, 0-10
extern uint16_t cellvoltages[120]; //mV 0-4350 per cell extern uint16_t cellvoltages[120]; //mV 0-4350 per cell
extern uint16_t nof_cellvoltages; // Total number of cell voltages, set by each battery.
extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false
void update_values_leaf_battery(); void update_values_leaf_battery();

15
Software/src/battery/TESLA-MODEL-3-BATTERY.cpp
View file

@ -455,6 +455,8 @@ void receive_can_tesla_model_3_battery(CAN_frame_t rx_frame) {
mux = (rx_frame.data.u8[0]); mux = (rx_frame.data.u8[0]);
static uint16_t volts; static uint16_t volts;
static uint8_t mux_zero_counter = 0u;
static uint8_t mux_max = 0u;
if (rx_frame.data.u8[1] == 0x2A) // status byte must be 0x2A to read cellvoltages if (rx_frame.data.u8[1] == 0x2A) // status byte must be 0x2A to read cellvoltages
{ {
@ -465,6 +467,19 @@ void receive_can_tesla_model_3_battery(CAN_frame_t rx_frame) {
cellvoltages[1 + mux * 3] = volts; cellvoltages[1 + mux * 3] = volts;
volts = ((rx_frame.data.u8[7] << 8) | rx_frame.data.u8[6]) / 10; volts = ((rx_frame.data.u8[7] << 8) | rx_frame.data.u8[6]) / 10;
cellvoltages[2 + mux * 3] = volts; cellvoltages[2 + mux * 3] = volts;
// Track the max value of mux. If we've seen two 0 values for mux, we've probably gathered all
// cell voltages. Then, 2 + mux_max * 3 + 1 is the number of cell voltages.
mux_max = (mux > mux_max) ? mux : mux_max;
if (mux_zero_counter < 2 && mux == 0u) {
mux_zero_counter++;
if (mux_zero_counter == 2u) {
// The max index will be 2 + mux_max * 3 (see above), so "+ 1" for the number of cells
nof_cellvoltages = 2 + 3 * mux_max + 1;
// Increase the counter arbitrarily another time to make the initial if-statement evaluate to false
mux_zero_counter++;
}
}
} }
break; break;
case 0x2d2: case 0x2d2:

1
Software/src/battery/TESLA-MODEL-3-BATTERY.h
View file

@ -29,6 +29,7 @@ extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 func
extern uint16_t cell_max_voltage; //mV, 0-4350 extern uint16_t cell_max_voltage; //mV, 0-4350
extern uint16_t cell_min_voltage; //mV, 0-4350 extern uint16_t cell_min_voltage; //mV, 0-4350
extern uint16_t cellvoltages[120]; //mV 0-4350 per cell extern uint16_t cellvoltages[120]; //mV 0-4350 per cell
extern uint16_t nof_cellvoltages; // Total number of cell voltages, set by each battery.
extern uint8_t LEDcolor; //Enum, 0-10 extern uint8_t LEDcolor; //Enum, 0-10
extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false
extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false