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

Some small improvements.

Browse source 
- Start polling frame earlier.
- Prevent false positive on delayed can sending.
- Add log message for first CAN received from battery.
- Add log message for timeout of CAN reception from battery.
This commit is contained in:
mvgalen 2025-01-14 08:06:13 +01:00
parent 8e118a75cd
commit a0c5e63514
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Software/src/battery/MEB-BATTERY.cpp
View file

@ -642,8 +642,10 @@ void update_values_battery() { //This function maps all the values fetched via
void handle_incoming_can_frame_battery(CAN_frame rx_frame) { void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
last_can_msg_timestamp = millis(); last_can_msg_timestamp = millis();
if (first_can_msg == 0) if (first_can_msg == 0) {
logging.printf("MEB: First CAN msg received\n");
first_can_msg = last_can_msg_timestamp; first_can_msg = last_can_msg_timestamp;
}
switch (rx_frame.ID) { switch (rx_frame.ID) {
case 0x17F0007B: // BMS 500ms case 0x17F0007B: // BMS 500ms
can_msg_received |= RX_0x17F0007B; can_msg_received |= RX_0x17F0007B;
@ -1524,6 +1526,8 @@ void transmit_can_battery() {
unsigned long currentMillis = millis(); unsigned long currentMillis = millis();
// Send 10ms CAN Message // Send 10ms CAN Message
if (datalayer.system.settings.equipment_stop_active || currentMillis > last_can_msg_timestamp + 500) { if (datalayer.system.settings.equipment_stop_active || currentMillis > last_can_msg_timestamp + 500) {
if (first_can_msg)
logging.printf("MEB: No CAN msg received for 500ms\n");
can_msg_received = RX_DEFAULT; can_msg_received = RX_DEFAULT;
first_can_msg = 0; first_can_msg = 0;
if (datalayer.battery.status.bms_status != FAULT) if (datalayer.battery.status.bms_status != FAULT)
@ -1532,7 +1536,7 @@ void transmit_can_battery() {
if (currentMillis - previousMillis10ms >= INTERVAL_10_MS) { if (currentMillis - previousMillis10ms >= INTERVAL_10_MS) {
// Check if sending of CAN messages has been delayed too much. // Check if sending of CAN messages has been delayed too much.
if ((currentMillis - previousMillis10ms >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME)) { if ((currentMillis - previousMillis10ms >= INTERVAL_10_MS_DELAYED) && (currentMillis > BOOTUP_TIME) && previousMillis10ms > 0) {
set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10ms)); set_event(EVENT_CAN_OVERRUN, (currentMillis - previousMillis10ms));
} else { } else {
clear_event(EVENT_CAN_OVERRUN); clear_event(EVENT_CAN_OVERRUN);
@ -2155,7 +2159,7 @@ void transmit_can_battery() {
poll_pid = PID_SOC; poll_pid = PID_SOC;
break; break;
} }
if (first_can_msg > 0 && currentMillis > first_can_msg + 2000) { if (first_can_msg > 0 && currentMillis > first_can_msg + 1000) {
transmit_can_frame(&MEB_POLLING_FRAME, can_config.battery); transmit_can_frame(&MEB_POLLING_FRAME, can_config.battery);
} }
} }