fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

esp32/mphalport: Always poll stdin ring-buffer to include UART use.

Browse Source 
This fixes a regression introduced in commit
4247921c4ebfced79aa7ccfbb835c9f60ad6f0fc, where this ring-buffer polling
was accidentally put inside the `#if MICROPY_HW_ESP_USB_SERIAL_JTAG`.

Signed-off-by: Andrew Leech <andrew@alelec.net>
This commit is contained in:
Andrew Leech 2024-10-14 05:32:41 +11:00 committed by Damien George
parent 838f21298a
commit 3fecab58a0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ports/esp32/mphalport.c
View File

@ -109,12 +109,6 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
uintptr_t ret = 0; uintptr_t ret = 0;
#if MICROPY_HW_ESP_USB_SERIAL_JTAG #if MICROPY_HW_ESP_USB_SERIAL_JTAG
usb_serial_jtag_poll_rx(); usb_serial_jtag_poll_rx();
if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
ret |= MP_STREAM_POLL_RD;
}
if (poll_flags & MP_STREAM_POLL_WR) {
ret |= MP_STREAM_POLL_WR;
}
#endif #endif
#if MICROPY_HW_USB_CDC #if MICROPY_HW_USB_CDC
ret |= mp_usbd_cdc_poll_interfaces(poll_flags); ret |= mp_usbd_cdc_poll_interfaces(poll_flags);
@ -122,6 +116,13 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
#if MICROPY_PY_OS_DUPTERM #if MICROPY_PY_OS_DUPTERM
ret |= mp_os_dupterm_poll(poll_flags); ret |= mp_os_dupterm_poll(poll_flags);
#endif #endif
// Check ringbuffer directly for uart and usj.
if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
ret |= MP_STREAM_POLL_RD;
}
if (poll_flags & MP_STREAM_POLL_WR) {
ret |= MP_STREAM_POLL_WR;
}
return ret; return ret;
} }