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

Remove old delay blocking workaround

Browse source
This commit is contained in:
Daniel Öster 2025-03-06 21:13:21 +02:00
parent df3024cdfb
commit c4cc9a969b
2 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c
View file

@ -266,13 +266,13 @@ int CAN_init() {
bool CAN_write_frame(const CAN_frame_t *p_frame) { bool CAN_write_frame(const CAN_frame_t *p_frame) {
if (sem_tx_complete == NULL) { if (sem_tx_complete == NULL) {
return 0; return false;
} }
// Write the frame to the controller // Write the frame to the controller
CAN_write_frame_phy(p_frame); CAN_write_frame_phy(p_frame);
return xSemaphoreTake(sem_tx_complete, 20) == pdTRUE ? 1 : 0; return xSemaphoreTake(sem_tx_complete, 20) == pdTRUE ? true : false;
} }
int CAN_stop() { int CAN_stop() {

15
Software/src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.cpp
View file

@ -6,20 +6,7 @@ int ESP32CAN::CANInit() {
return CAN_init(); return CAN_init();
} }
bool ESP32CAN::CANWriteFrame(const CAN_frame_t* p_frame) { bool ESP32CAN::CANWriteFrame(const CAN_frame_t* p_frame) {
static unsigned long start_time; return CAN_write_frame(p_frame);
bool result = false;
if (tx_ok) {
result = CAN_write_frame(p_frame);
tx_ok = result;
if (!tx_ok) {
start_time = millis();
}
} else {
if ((millis() - start_time) >= 20) {
tx_ok = true;
}
}
return result;
} }
int ESP32CAN::CANStop() { int ESP32CAN::CANStop() {