Fix stack corruption while transmitting packets on ESP32 board package versions 3.x.x

Author: 0xCAFEDECAF

src/VanBusRx.cpp

@@ -601,11 +601,9 @@ extern hw_timer_t* txTimer;
 void IRAM_ATTR SetTxBitTimer()
 {
   #ifdef ARDUINO_ARCH_ESP32
-   #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-    //timerStop(timer);
-   #else // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+   #if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
     timerAlarmDisable(timer);
-   #endif // ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+   #endif // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
   #else // ! ARDUINO_ARCH_ESP32
     timer1_disable();
   #endif // ARDUINO_ARCH_ESP32
@@ -617,10 +615,8 @@ void IRAM_ATTR SetTxBitTimer()
       #ifdef ARDUINO_ARCH_ESP32
 
        #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-        timerDetachInterrupt(txTimer);
-        timerAttachInterrupt(txTimer, VanBusRx.txTimerIsr);
         timerAlarm(txTimer, VanBusRx.txTimerTicks, true, 0);
-        timerRestart(txTimer);
+        timerStart(txTimer);
        #else // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
         timerAlarmDisable(timer);
         timerDetachInterrupt(timer);
@@ -916,13 +912,9 @@ void IRAM_ATTR RxPinChangeIsr()
         {
           #ifdef ARDUINO_ARCH_ESP32
 
-           #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-            //if (timerRead(timer) > 0) timerStop(timer);
-            //timerStop(timer);
-            // if (timerRead(timer) < 40) timerStop(timer);
-           #else // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+           #if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
             timerAlarmDisable(timer);
-           #endif // ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+           #endif // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
 
           #else // ! ARDUINO_ARCH_ESP32
             timer1_disable();
@@ -1359,11 +1351,9 @@ void TVanPacketRxQueue::Disable()
 
   #ifdef ARDUINO_ARCH_ESP32
 
-   #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-    //timerStop(timer);
-   #else // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+   #if ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
     timerAlarmDisable(timer);
-   #endif // ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
+   #endif // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
 
   #else // ! ARDUINO_ARCH_ESP32
     timer1_disable();

src/VanBusTx.cpp

@@ -40,7 +40,7 @@ void IRAM_ATTR FinishPacketTransmission(TVanPacketTxDesc* txDesc)
 
       #ifdef ARDUINO_ARCH_ESP32
       #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-        timerDetachInterrupt(txTimer);
+        timerStop(txTimer);
       #else // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
         timerAlarmDisable(timer);
         timerDetachInterrupt(timer);
@@ -178,6 +178,7 @@ void TVanPacketTxQueue::Setup(uint8_t theRxPin, uint8_t theTxPin)
    #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
     #define TIMER_FREQ (5000000)
     txTimer = timerBegin(TIMER_FREQ);
+    timerAttachInterrupt(txTimer, &SendBitIsr);
    #endif
   #endif
 
@@ -266,11 +267,8 @@ void TVanPacketTxQueue::StartBitSendTimer()
  #ifdef ARDUINO_ARCH_ESP32
 
   #if ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0)
-    // timerStop(timer);
-    timerDetachInterrupt(txTimer);
-    timerAttachInterrupt(txTimer, &SendBitIsr);
     timerAlarm(txTimer, VAN_BIT_TIMER_TICKS, true, 0);
-    timerRestart(txTimer);
+    timerStart(txTimer);
   #else // ESP_ARDUINO_VERSION < ESP_ARDUINO_VERSION_VAL(3, 0, 0)
     if (! timerAlarmEnabled(timer))
     {