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

Bug fix for PR#457 (disable send CAN when pause for update)

Browse source
This commit is contained in:
amarofarinha 2024-09-16 09:28:43 +01:00
parent 5dc413462b
commit c1e67dae98
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Software/Software.ino
View file

@ -94,6 +94,8 @@ MyTimer connectivity_task_timer_10s(INTERVAL_10_S);
MyTimer loop_task_timer_10s(INTERVAL_10_S); MyTimer loop_task_timer_10s(INTERVAL_10_S);
MyTimer check_pause_2s(INTERVAL_2_S);
// Contactor parameters // Contactor parameters
#ifdef CONTACTOR_CONTROL #ifdef CONTACTOR_CONTROL
enum State { DISCONNECTED, PRECHARGE, NEGATIVE, POSITIVE, PRECHARGE_OFF, COMPLETED, SHUTDOWN_REQUESTED }; enum State { DISCONNECTED, PRECHARGE, NEGATIVE, POSITIVE, PRECHARGE_OFF, COMPLETED, SHUTDOWN_REQUESTED };
@ -287,6 +289,10 @@ void core_loop(void* task_time_us) {
datalayer.system.status.time_cantx_us = 0; datalayer.system.status.time_cantx_us = 0;
datalayer.system.status.core_task_10s_max_us = 0; datalayer.system.status.core_task_10s_max_us = 0;
} }
if (check_pause_2s.elapsed()) {
emulator_pause_state_send_CAN_battery();
}
#endif #endif
vTaskDelayUntil(&xLastWakeTime, xFrequency); vTaskDelayUntil(&xLastWakeTime, xFrequency);
} }
@ -572,14 +578,16 @@ void receive_can_native() { // This section checks if we have a complete CAN me
void send_can() { void send_can() {
send_can_battery(); if (can_send_CAN)
send_can_battery();
#ifdef CAN_INVERTER_SELECTED #ifdef CAN_INVERTER_SELECTED
send_can_inverter(); send_can_inverter();
#endif // CAN_INVERTER_SELECTED #endif // CAN_INVERTER_SELECTED
#ifdef CHARGER_SELECTED #ifdef CHARGER_SELECTED
send_can_charger(); if (can_send_CAN)
send_can_charger();
#endif // CHARGER_SELECTED #endif // CHARGER_SELECTED
} }