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

Simplify DigitalHVIL sending to increase performance

Browse source
This commit is contained in:
Daniel Öster 2025-09-25 15:30:52 +03:00
parent 483d4300b1
commit f48b4235c1
2 changed files with 19 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1870,7 +1870,7 @@ void TeslaBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
stateMachineBMSQuery = 1; stateMachineBMSQuery = 1;
break; break;
} }
if (memcmp(&rx_frame.data.u8[0], "\x10", 1) == 0) { if (rx_frame.data.u8[0] == 0x10) {
//Received first data frame //Received first data frame
battery_partNumber[0] = rx_frame.data.u8[5]; battery_partNumber[0] = rx_frame.data.u8[5];
battery_partNumber[1] = rx_frame.data.u8[6]; battery_partNumber[1] = rx_frame.data.u8[6];
@ -1879,7 +1879,7 @@ void TeslaBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
stateMachineBMSQuery = 2; stateMachineBMSQuery = 2;
break; break;
} }
if (memcmp(&rx_frame.data.u8[0], "\x21", 1) == 0) { if (rx_frame.data.u8[0] == 0x21) {
//Second part of part number after flow control //Second part of part number after flow control
battery_partNumber[3] = rx_frame.data.u8[1]; battery_partNumber[3] = rx_frame.data.u8[1];
battery_partNumber[4] = rx_frame.data.u8[2]; battery_partNumber[4] = rx_frame.data.u8[2];
@ -1891,7 +1891,7 @@ void TeslaBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
logging.println("CAN UDS: Received BMS query second data frame"); logging.println("CAN UDS: Received BMS query second data frame");
break; break;
} }
if (memcmp(&rx_frame.data.u8[0], "\x22", 1) == 0) { if (rx_frame.data.u8[0] == 0x22) {
//Final part of part number //Final part of part number
battery_partNumber[10] = rx_frame.data.u8[1]; battery_partNumber[10] = rx_frame.data.u8[1];
battery_partNumber[11] = rx_frame.data.u8[2]; battery_partNumber[11] = rx_frame.data.u8[2];
@ -1950,41 +1950,26 @@ CAN_frame can_msg_118[] = {
{.FD = false, .ext_ID = false, .DLC = 8, .ID = 0x118, .data = {0x6F, 0x8E, 0x30, 0x10, 0x00, 0x08, 0x00, 0x80}}, {.FD = false, .ext_ID = false, .DLC = 8, .ID = 0x118, .data = {0x6F, 0x8E, 0x30, 0x10, 0x00, 0x08, 0x00, 0x80}},
{.FD = false, .ext_ID = false, .DLC = 8, .ID = 0x118, .data = {0x70, 0x8F, 0x30, 0x10, 0x00, 0x08, 0x00, 0x80}}}; {.FD = false, .ext_ID = false, .DLC = 8, .ID = 0x118, .data = {0x70, 0x8F, 0x30, 0x10, 0x00, 0x08, 0x00, 0x80}}};
unsigned long lastSend1CF = 0;
unsigned long lastSend118 = 0;
int index_1CF = 0;
int index_118 = 0;
void TeslaBattery::transmit_can(unsigned long currentMillis) { void TeslaBattery::transmit_can(unsigned long currentMillis) {
if (user_selected_tesla_digital_HVIL) { //Special S/X? mode for 2024+ batteries
if ((datalayer.system.status.inverter_allows_contactor_closing) && (datalayer.battery.status.bms_status != FAULT)) {
if (currentMillis - lastSend1CF >= 10) {
transmit_can_frame(&can_msg_1CF[index_1CF]);
index_1CF = (index_1CF + 1) % 8;
lastSend1CF = currentMillis;
}
if (currentMillis - lastSend118 >= 10) {
transmit_can_frame(&can_msg_118[index_118]);
index_118 = (index_118 + 1) % 16;
lastSend118 = currentMillis;
}
} else {
index_1CF = 0;
index_118 = 0;
}
}
//Send 10ms messages //Send 10ms messages
if (currentMillis - previousMillis10 >= INTERVAL_10_MS) { if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
previousMillis10 = currentMillis; previousMillis10 = currentMillis;
//0x118 DI_systemStatus if (user_selected_tesla_digital_HVIL) { //Special Digital HVIL mode for S/X 2024+ batteries
transmit_can_frame(&TESLA_118); if ((datalayer.system.status.inverter_allows_contactor_closing) &&
(datalayer.battery.status.bms_status != FAULT)) {
transmit_can_frame(&can_msg_1CF[index_1CF]);
index_1CF = (index_1CF + 1) % 8;
transmit_can_frame(&can_msg_118[index_118]);
index_118 = (index_118 + 1) % 16;
}
} else { //Normal handling of 118 message (Non digital HVIL version)
//0x118 DI_systemStatus
transmit_can_frame(&TESLA_118);
index_1CF = 0; //Stop broadcasting Digital HVIL 1CF and 118 to keep contactors open
index_118 = 0;
}
//0x2E1 VCFRONT_status //0x2E1 VCFRONT_status
switch (muxNumber_TESLA_2E1) { switch (muxNumber_TESLA_2E1) {

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

@ -461,7 +461,8 @@ class TeslaBattery : public CanBattery {
.DLC = 8, .DLC = 8,
.ID = 0x610, .ID = 0x610,
.data = {0x02, 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}}; // Define initial UDS request .data = {0x02, 0x10, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}}; // Define initial UDS request
uint8_t index_1CF = 0;
uint8_t index_118 = 0;
uint8_t stateMachineClearIsolationFault = 0xFF; uint8_t stateMachineClearIsolationFault = 0xFF;
uint8_t stateMachineBMSReset = 0xFF; uint8_t stateMachineBMSReset = 0xFF;
uint8_t stateMachineSOCReset = 0xFF; uint8_t stateMachineSOCReset = 0xFF;