Esp32 Core version 3

src/IRrecv.cpp

@@ -69,6 +69,14 @@ static ETSTimer timer;
 #endif  // Version check
 #endif  // !defined(_ESP32_IRRECV_TIMER_HACK)
 
+// Define ARDUINO_COREV3 macro
+#if defined(ESP_ARDUINO_VERSION) && \
+    (ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0))
+  #define ARDUINO_COREV3 1
+#else
+  #define ARDUINO_COREV3 0
+#endif
+
 #if _ESP32_IRRECV_TIMER_HACK
 // Required structs/types from:
 // https://github.com/espressif/arduino-esp32/blob/6b0114366baf986c155e8173ab7c22bc0c5fcedc/cores/esp32/esp32-hal-timer.c#L28-L58
@@ -134,7 +142,8 @@ typedef struct hw_timer_s {
 #endif  // _ESP32_IRRECV_TIMER_HACK / End of Horrible Hack.
 
 namespace _IRrecv {
-static hw_timer_t * timer = NULL;
+static hw_timer_t *timer = NULL;  // Declare ESP32 timer variable
+
 }  // namespace _IRrecv
 #endif  // ESP32
 using _IRrecv::timer;
@@ -226,7 +235,7 @@ static void USE_IRAM_ATTR gpio_intr() {
   // Reset the timeout.
   //
 #if _ESP32_IRRECV_TIMER_HACK
-  // The following three lines of code are the equiv of:
+  // The following three lines of code are the equivalent of:
   //   `timerWrite(timer, 0);`
   // We can't call that routine safely from inside an ISR as that procedure
   // is not stored in IRAM. Hence, we do it manually so that it's covered by
@@ -241,9 +250,15 @@ static void USE_IRAM_ATTR gpio_intr() {
   // @see https://github.com/crankyoldgit/IRremoteESP8266/issues/1350
   // @see https://github.com/espressif/arduino-esp32/blob/6b0114366baf986c155e8173ab7c22bc0c5fcedc/cores/esp32/esp32-hal-timer.c#L176-L178
   timer->dev->config.alarm_en = 1;
-#else  // _ESP32_IRRECV_TIMER_HACK
+#elif ARDUINO_COREV3
+  // For ESP32 core version 3.x, replace `timerAlarmEnable`
   timerWrite(timer, 0);
-  timerAlarmEnable(timer);
+  uint64_t alarm_value = 50000;  // Example value (50ms)
+  timerAlarm(timer, alarm_value, false, 0);
+#else
+    // For ESP32 core version 2.x, keep using `timerAlarmEnable`
+    timerWrite(timer, 0);
+    timerAlarmEnable(timer);
 #endif  // _ESP32_IRRECV_TIMER_HACK
 #endif  // ESP32
 }
@@ -356,23 +371,35 @@ void IRrecv::enableIRIn(const bool pullup) {
     pinMode(params.recvpin, INPUT);
 #endif  // UNIT_TEST
   }
+
 #if defined(ESP32)
   // Initialise the ESP32 timer.
-  // 80MHz / 80 = 1 uSec granularity.
-  timer = timerBegin(_timer_num, 80, true);
+#if ARDUINO_COREV3
+  // Use newer timerBegin signature for ESP32 core version 3.x
+  timer = timerBegin(1000000);  // Initialize with 1MHz (1us per tick)
+#else
+  // Fallback for ESP32 core version 2.x or earlier
+  timer = timerBegin(0, 1000000, true);  // Old signature with divider
+#endif
+
+  // Ensure the timer is successfully initialized
 #ifdef DEBUG
   if (timer == NULL) {
     DPRINT("FATAL: Unable enable system timer: ");
     DPRINTLN((uint16_t)_timer_num);
   }
 #endif  // DEBUG
   assert(timer != NULL);  // Check we actually got the timer.
-  // Set the timer so it only fires once, and set it's trigger in uSeconds.
-  timerAlarmWrite(timer, MS_TO_USEC(params.timeout), ONCE);
-  // Note: Interrupt needs to be attached before it can be enabled or disabled.
-  // Note: EDGE (true) is not supported, use LEVEL (false). Ref: #1713
-  // See: https://github.com/espressif/arduino-esp32/blob/caef4006af491130136b219c1205bdcf8f08bf2b/cores/esp32/esp32-hal-timer.c#L224-L227
-  timerAttachInterrupt(timer, &read_timeout, false);
+  // Set the timer so it only fires once, and set its trigger in microseconds.
+#if ARDUINO_COREV3
+    timerWrite(timer, 0);  // Reset the timer for ESP32 core version 3.x
+    timerAttachInterrupt(timer, &read_timeout);
+#else
+    // Attach timer interrupt for core version 2.x
+    timerAlarmWrite(timer, MS_TO_USEC(params.timeout), true);
+    timerAttachInterrupt(timer, &read_timeout, false);
+#endif
+
 #endif  // ESP32
 
   // Initialise state machine variables
@@ -398,9 +425,18 @@ void IRrecv::disableIRIn(void) {
   os_timer_disarm(&timer);
 #endif  // ESP8266
 #if defined(ESP32)
-  timerAlarmDisable(timer);
-  timerDetachInterrupt(timer);
-  timerEnd(timer);
+  // Check for ESP32 core version and handle timer functions differently
+  #if ARDUINO_COREV3
+    // For ESP32 core version 3.x
+    timerWrite(timer, 0);  // Reset the timer
+    timerDetachInterrupt(timer);  // Detach the interrupt
+    timerEnd(timer);  // End the timer
+  #else
+    // For ESP32 core version 2.x
+    timerAlarmDisable(timer);  // Disable the alarm
+    timerDetachInterrupt(timer);  // Detach the interrupt
+    timerEnd(timer);  // End the timer
+  #endif
 #endif  // ESP32
   detachInterrupt(params.recvpin);
 #endif  // UNIT_TEST
@@ -426,7 +462,17 @@ void IRrecv::resume(void) {
   params.rawlen = 0;
   params.overflow = false;
 #if defined(ESP32)
-  timerAlarmDisable(timer);
+  // Check for ESP32 core version and handle timer functions differently
+#if defined(ESP_ARDUINO_VERSION) && \
+    (ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(3, 0, 0))
+    // For ESP32 core version 3.x
+    timerWrite(timer, 0);  // Reset the timer (no need for timerAlarmDisable)
+  #else
+    // For ESP32 core version 2.x
+    timerAlarmDisable(timer);  // Disable the alarm
+  #endif
+
+  // Re-enable GPIO interrupt in both versions
   gpio_intr_enable((gpio_num_t)params.recvpin);
 #endif  // ESP32
 }