added micropython.kbd_intr_enable(bool) to allow enable/disable keyboard interrupt on ESP32*

xuancong84 · xuancong84 · commit 2e7cd9f392c3 · 2025-04-09T11:26:33.000+08:00
This is useful for ESP32* as it allows STDIO ports to be used as UART ports for interacting with extern devices.
mp_hal_set_interrupt_char(int) is supposed to work but does not work because every time when
parse_compile_execute() is called, the intr_char is reset depending on exec_flags.
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
@@ -100,6 +100,7 @@ int uart_stdout_tx_strn(const char *str, size_t len) {
 }
 
 // all code executed in ISR must be in IRAM, and any const data must be in DRAM
+extern bool mp_kbd_intr_enable;
 static void IRAM_ATTR uart_irq_handler(void *arg) {
     uint8_t rbuf[SOC_UART_FIFO_LEN];
     int len;
@@ -112,7 +113,7 @@ static void IRAM_ATTR uart_irq_handler(void *arg) {
     uart_hal_read_rxfifo(&repl_hal, rbuf, &len);
 
     for (int i = 0; i < len; i++) {
-        if (rbuf[i] == mp_interrupt_char) {
+        if (mp_kbd_intr_enable && rbuf[i] == mp_interrupt_char) {
             mp_sched_keyboard_interrupt();
         } else {
             // this is an inline function so will be in IRAM
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
@@ -40,6 +40,7 @@
 static DRAM_ATTR portMUX_TYPE rx_mux = portMUX_INITIALIZER_UNLOCKED;
 static uint8_t rx_buf[USB_SERIAL_JTAG_BUF_SIZE];
 static volatile bool terminal_connected = false;
+extern bool mp_kbd_intr_enable;
 
 static void usb_serial_jtag_handle_rx(void) {
     if (xPortInIsrContext()) {
@@ -53,7 +54,7 @@ static void usb_serial_jtag_handle_rx(void) {
     }
     size_t len = usb_serial_jtag_ll_read_rxfifo(rx_buf, req_len);
     for (size_t i = 0; i < len; ++i) {
-        if (rx_buf[i] == mp_interrupt_char) {
+        if (mp_kbd_intr_enable && rx_buf[i] == mp_interrupt_char) {
             mp_sched_keyboard_interrupt();
         } else {
             ringbuf_put(&stdin_ringbuf, rx_buf[i]);
diff --git a/py/modmicropython.c b/py/modmicropython.c
@@ -149,11 +149,19 @@ static MP_DEFINE_CONST_FUN_OBJ_1(mp_alloc_emergency_exception_buf_obj, mp_alloc_
 #endif
 
 #if MICROPY_KBD_EXCEPTION
+extern int mp_interrupt_char, mp_kbd_intr_enable;
 static mp_obj_t mp_micropython_kbd_intr(mp_obj_t int_chr_in) {
+    int old_intr_char = mp_interrupt_char;
     mp_hal_set_interrupt_char(mp_obj_get_int(int_chr_in));
-    return mp_const_none;
+    return mp_obj_new_int(old_intr_char);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_micropython_kbd_intr_obj, mp_micropython_kbd_intr);
+
+static mp_obj_t mp_micropython_kbd_intr_enable(mp_obj_t state) {
+    mp_kbd_intr_enable = mp_obj_get_int(state);
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_micropython_kbd_intr_enable_obj, mp_micropython_kbd_intr_enable);
 #endif
 
 #if MICROPY_ENABLE_SCHEDULER
@@ -199,6 +207,7 @@ static const mp_rom_map_elem_t mp_module_micropython_globals_table[] = {
     #endif
     #if MICROPY_KBD_EXCEPTION
     { MP_ROM_QSTR(MP_QSTR_kbd_intr), MP_ROM_PTR(&mp_micropython_kbd_intr_obj) },
+    { MP_ROM_QSTR(MP_QSTR_kbd_intr_enable), MP_ROM_PTR(&mp_micropython_kbd_intr_enable_obj) },
     #endif
     #if MICROPY_PY_MICROPYTHON_RINGIO
     { MP_ROM_QSTR(MP_QSTR_RingIO), MP_ROM_PTR(&mp_type_ringio) },
diff --git a/shared/runtime/interrupt_char.c b/shared/runtime/interrupt_char.c
@@ -30,7 +30,7 @@
 #if MICROPY_KBD_EXCEPTION
 
 int mp_interrupt_char = -1;
-
+int mp_kbd_intr_enable = 1;
 void mp_hal_set_interrupt_char(int c) {
     mp_interrupt_char = c;
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`#if MICROPY_KBD_EXCEPTION`
`31`	`31`
`32`	`32`	`int mp_interrupt_char = -1;`
`33`		`-`
	`33`	`+int mp_kbd_intr_enable = 1;`
`34`	`34`	`void mp_hal_set_interrupt_char(int c) {`
`35`	`35`	`mp_interrupt_char = c;`
`36`	`36`	`}`