esp32 working after merge

xuancong84 · xuancong84 · commit f0031ae98568 · 2025-03-16T13:47:19.000+08:00
diff --git a/extmod/modmachine.c b/extmod/modmachine.c
@@ -124,17 +124,15 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsle
 #endif
 
 #if MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ
-uint32_t g_irq_state = 1;
 static mp_obj_t machine_disable_irq(void) {
     uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
-    g_irq_state = 0;
     return mp_obj_new_int(state);
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
 
 static mp_obj_t machine_enable_irq(mp_obj_t state_in) {
-    g_irq_state = mp_obj_get_int(state_in);
-    MICROPY_END_ATOMIC_SECTION(g_irq_state);
+    uint32_t irq_state = mp_obj_get_int(state_in);
+    MICROPY_END_ATOMIC_SECTION(irq_state);
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
diff --git a/ports/esp32/build.sh b/ports/esp32/build.sh
@@ -2,7 +2,7 @@
 
 cd `dirname $(readlink -f "$0")`
 
-export PATH=~/.espressif/python_env/idf5*_env/bin:$PATH
+export PATH=~/.espressif/python_env/idf5.2*_env/bin:$PATH
 
 cd ~/projects/esp-idf
 source export.sh
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
@@ -222,11 +222,7 @@ void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
     // prevent pathological imbalances where a thread unlocks and then
     // immediately re-locks a mutex before a context switch can occur, leaving
     // another thread waiting for an unbounded period of time.
-#if MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ
-    extern uint32_t g_irq_state;
-    if(g_irq_state==1)
-#endif
-        taskYIELD();
+    taskYIELD();
 }
 
 void mp_thread_deinit(void) {
