esp32/machine_timer.c: Add find free timer id.

IhorNehrutsa · IhorNehrutsa · commit 01ea7b36e70d · 2025-11-17T16:06:29.000+03:00
``id`` of -2 selects the ``id`` of a free timer.
Check the timer `id` range.
Check if the timer is already in use.

Signed-off-by: IhorNehrutsa &lt;Ihor.Nehrutsa@gmail.com&gt;
diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
@@ -32,6 +32,7 @@ Constructors
 
    Construct a new timer object of the given ``id``. ``id`` of -1 constructs a
    virtual timer (if supported by a board).
+   ``id`` of -2 selects the ``id`` of a free timer (Supported at ESP32 port).
    ``id`` shall not be passed as a keyword argument.
 
    See ``init`` for parameters of initialisation.
diff --git a/lib/berkeley-db-1.xx b/lib/berkeley-db-1.xx
@@ -1 +1 @@
-Subproject commit 0f3bb6947c2f57233916dccd7bb425d7bf86e5a6
+Subproject commit 35aaec4418ad78628a3b935885dd189d41ce779b
diff --git a/lib/cyw43-driver b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit dd7568229f3bf7a37737b9e1ef250c26efe75b23
+Subproject commit 2ab0db6e1fe9265fa9802a95f7f4d60b7f0d655a
diff --git a/lib/libffi b/lib/libffi
@@ -1 +1 @@
-Subproject commit 3d0ce1e6fcf19f853894862abcbac0ae78a7be60
+Subproject commit e9de7e35f2339598b16cbb375f9992643ed81209
diff --git a/lib/libhydrogen b/lib/libhydrogen
@@ -1 +1 @@
-Subproject commit bbca575b62510bfdc6dd927a4bfa7df4a51cb846
+Subproject commit 5c5d513093075f7245ea522101b17c50aa579af2
diff --git a/lib/lwip b/lib/lwip
@@ -1 +1 @@
-Subproject commit 77dcd25a72509eb83f72b033d219b1d40cd8eb95
+Subproject commit 6ca936f6b588cee702c638eee75c2436e6cf75de
diff --git a/lib/mbedtls b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 107ea89daaefb9867ea9121002fbbdf926780e98
+Subproject commit 981743de6fcdbe672e482b6fd724d31d0a0d2476
diff --git a/lib/micropython-lib b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 34c4ee1647ac4b177ae40adf0ec514660e433dc0
+Subproject commit 7cdf70881519c73667efbc4a61a04d9c1a49babb
diff --git a/lib/nxp_driver b/lib/nxp_driver
@@ -1 +1 @@
-Subproject commit 91b04b34a59f6d81661cec6f84611afe6330ce92
+Subproject commit fa5a554c7944d2a196626f8d3631e44943f9abcc
diff --git a/lib/pico-sdk b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 9a4113fbbae65ee82d8cd6537963bc3d3b14bcca
+Subproject commit 6a7db34ff63345a7badec79ebea3aaef1712f374
diff --git a/lib/stm32lib b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 07619754261b571fb2f7c9f36ab94c203880d9fb
+Subproject commit 928df866e4d287ebc3c60726151513ebee609128
diff --git a/lib/tinyusb b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 86ad6e56c1700e85f1c5678607a762cfe3aa2f47
+Subproject commit 1fdf29075d4e613eacfa881166015263797db0f6
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
@@ -82,16 +82,44 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
     #endif
 }
 
-machine_timer_obj_t *machine_timer_create(mp_uint_t timer) {
+static bool find_free_timer(mp_int_t *group, mp_int_t *index) {
+    // from highest to lowest id
+    for (*group = SOC_TIMER_GROUPS - 1; *group >= 0; --(*group)) {
+        for (*index = SOC_TIMER_GROUP_TIMERS_PER_GROUP - 1; *index >= 0; --(*index)) {
+            bool free = true;
+            // Check whether the timer is already initialized, if so skip it
+            for (machine_timer_obj_t *t = MP_STATE_PORT(machine_timer_obj_head); t; t = t->next) {
+                if (t->group == *group && t->index == *index) {
+                    free = false;
+                    break;
+                }
+            }
+            if (free) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+machine_timer_obj_t *machine_timer_create(mp_int_t timer) {
 
     machine_timer_obj_t *self = NULL;
-    #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
-    mp_uint_t group = timer & 1;
-    mp_uint_t index = 0;
-    #else
-    mp_uint_t group = (timer >> 1) & 1;
-    mp_uint_t index = timer & 1;
-    #endif
+    mp_int_t group;
+    mp_int_t index;
+    if (timer == -2) {
+        if (!find_free_timer(&group, &index)) {
+            mp_raise_msg_varg(&mp_type_RuntimeError, MP_ERROR_TEXT("out of Timers:%d"), SOC_TIMER_GROUP_TOTAL_TIMERS);
+        }
+    } else {
+        #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
+        group = timer & 1;
+        index = 0;
+        #else
+        group = (timer >> 1) & 1;
+        index = timer & 1;
+        #endif
+    }
 
     // Check whether the timer is already initialized, if so use it
     for (machine_timer_obj_t *t = MP_STATE_PORT(machine_timer_obj_head); t; t = t->next) {
@@ -118,7 +146,7 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // Create the new timer.
-    uint32_t timer_number = mp_obj_get_int(args[0]);
+    mp_int_t timer_number = mp_obj_get_int(args[0]);
     if (timer_number >= SOC_TIMER_GROUP_TOTAL_TIMERS) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid Timer number"));
     }
diff --git a/ports/esp32/machine_timer.h b/ports/esp32/machine_timer.h
@@ -53,7 +53,7 @@ typedef struct _machine_timer_obj_t {
     struct _machine_timer_obj_t *next;
 } machine_timer_obj_t;
 
-machine_timer_obj_t *machine_timer_create(mp_uint_t timer);
+machine_timer_obj_t *machine_timer_create(mp_int_t timer);
 void machine_timer_enable(machine_timer_obj_t *self);
 void machine_timer_disable(machine_timer_obj_t *self);
 
