From c4cc9a969b9c1fe217490018a9ad743f2f875a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C3=96ster?= Date: Thu, 6 Mar 2025 21:13:21 +0200 Subject: [PATCH] Remove old delay blocking workaround --- Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c | 4 ++-- .../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.cpp | 15 +-------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c b/Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c index 9ebad439..3a0bcc87 100644 --- a/Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c +++ b/Software/src/lib/miwagner-ESP32-Arduino-CAN/CAN.c @@ -266,13 +266,13 @@ int CAN_init() { bool CAN_write_frame(const CAN_frame_t *p_frame) { if (sem_tx_complete == NULL) { - return 0; + return false; } // Write the frame to the controller 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() { diff --git a/Software/src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.cpp b/Software/src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.cpp index 618115e0..cd025d08 100644 --- a/Software/src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.cpp +++ b/Software/src/lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.cpp @@ -6,20 +6,7 @@ int ESP32CAN::CANInit() { return CAN_init(); } bool ESP32CAN::CANWriteFrame(const CAN_frame_t* p_frame) { - static unsigned long start_time; - 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; + return CAN_write_frame(p_frame); } int ESP32CAN::CANStop() {