feat: update

Author: Lzw655

ports/esp32/main_esp32s3_box3/esp32_common.cmake

@@ -1,9 +1,3 @@
-# This is the common ESP-IDF "main component" CMakeLists.txt contents for MicroPython.
-#
-# This file is included directly from a main_${IDF_TARGET}/CMakeLists.txt file
-# (or included from an out-of-tree main component CMakeLists.txt for out-of-tree
-# builds.)
-
 # Set location of base MicroPython directory.
 if(NOT MICROPY_DIR)
     get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
@@ -42,7 +36,6 @@ list(APPEND MICROPY_SOURCE_SHARED
     ${MICROPY_DIR}/shared/netutils/netutils.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
     ${MICROPY_DIR}/shared/runtime/interrupt_char.c
-    ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${MICROPY_DIR}/shared/runtime/pyexec.c
@@ -63,37 +56,6 @@ list(APPEND MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
-string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
-if(MICROPY_PY_TINYUSB)
-    set(TINYUSB_SRC "${MICROPY_DIR}/lib/tinyusb/src")
-    string(TOUPPER OPT_MCU_${IDF_TARGET} tusb_mcu)
-
-    list(APPEND MICROPY_DEF_TINYUSB
-        CFG_TUSB_MCU=${tusb_mcu}
-    )
-
-    list(APPEND MICROPY_SOURCE_TINYUSB
-        ${TINYUSB_SRC}/tusb.c
-        ${TINYUSB_SRC}/common/tusb_fifo.c
-        ${TINYUSB_SRC}/device/usbd.c
-        ${TINYUSB_SRC}/device/usbd_control.c
-        ${TINYUSB_SRC}/class/cdc/cdc_device.c
-        ${TINYUSB_SRC}/portable/synopsys/dwc2/dcd_dwc2.c
-        ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
-        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_cdc.c
-        ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
-    )
-
-    list(APPEND MICROPY_INC_TINYUSB
-        ${TINYUSB_SRC}
-        ${MICROPY_DIR}/shared/tinyusb/
-    )
-
-    list(APPEND MICROPY_LINK_TINYUSB
-        -Wl,--wrap=dcd_event_handler
-    )
-endif()
-
 list(APPEND MICROPY_SOURCE_PORT
     panichandler.c
     adc.c
@@ -117,7 +79,6 @@ list(APPEND MICROPY_SOURCE_PORT
     network_wlan.c
     mpnimbleport.c
     modsocket.c
-    lwip_patch.c
     modesp.c
     esp32_nvs.c
     esp32_partition.c
@@ -183,7 +144,6 @@ list(APPEND IDF_COMPONENTS
     soc
     spi_flash
     ulp
-    usb
     vfs
 )
 
@@ -197,12 +157,10 @@ idf_component_register(
         ${MICROPY_SOURCE_DRIVERS}
         ${MICROPY_SOURCE_PORT}
         ${MICROPY_SOURCE_BOARD}
-        ${MICROPY_SOURCE_TINYUSB}
         ${MAIN_SOURCE_PORT}
     INCLUDE_DIRS
         ${MICROPY_INC_CORE}
         ${MICROPY_INC_USERMOD}
-        ${MICROPY_INC_TINYUSB}
         ${MICROPY_PORT_DIR}
         ${MICROPY_BOARD_DIR}
         ${CMAKE_BINARY_DIR}
@@ -216,15 +174,14 @@ idf_component_register(
 set(MICROPY_TARGET ${COMPONENT_TARGET})
 
 # Define mpy-cross flags, for use with frozen code.
-if(CONFIG_IDF_TARGET_ARCH STREQUAL "xtensa")
+if(NOT IDF_TARGET STREQUAL "esp32c3")
 set(MICROPY_CROSS_FLAGS -march=xtensawin)
 endif()
 
 # Set compile options for this port.
 target_compile_definitions(${MICROPY_TARGET} PUBLIC
     ${MICROPY_DEF_CORE}
     ${MICROPY_DEF_BOARD}
-    ${MICROPY_DEF_TINYUSB}
     MICROPY_ESP_IDF_4=1
     MICROPY_VFS_FAT=1
     MICROPY_VFS_LFS2=1
@@ -240,10 +197,6 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
     -Wno-missing-field-initializers
 )
 
-target_link_options(${MICROPY_TARGET} PUBLIC
-     ${MICROPY_LINK_TINYUSB}
-)
-
 # Additional include directories needed for private NimBLE headers.
 target_include_directories(${MICROPY_TARGET} PUBLIC
     ${IDF_PATH}/components/bt/host/nimble/nimble
@@ -253,13 +206,6 @@ target_include_directories(${MICROPY_TARGET} PUBLIC
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
-# Enable the panic handler wrapper
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=esp_panic_handler" APPEND)
-
-# Patch LWIP memory pool allocators (see lwip_patch.c)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_malloc" APPEND)
-idf_build_set_property(LINK_OPTIONS "-Wl,--wrap=memp_free" APPEND)
-
 # Collect all of the include directories and compile definitions for the IDF components,
 # including those added by the IDF Component Manager via idf_components.yaml.
 foreach(comp ${__COMPONENT_NAMES_RESOLVED})

ports/esp32/main_esp32s3_box3/lvgl_port.c

@@ -2,9 +2,12 @@
 #include <sys/lock.h>
 #include <sys/param.h>
 #include "esp_log.h"
+#include "esp_timer.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "esp_timer.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
+#include "py/runtime.h"
 #include "lvgl/lvgl.h"
 #include "lvgl_port.h"
 
@@ -95,36 +98,38 @@ static void increase_lvgl_tick(void *arg)
     lv_tick_inc(LVGL_TICK_PERIOD_MS);
 }
 
+static mp_obj_t mp_lv_task_handler(mp_obj_t arg)
+{
+    lv_timer_handler();
+    return mp_const_none;
+}
+static MP_DEFINE_CONST_FUN_OBJ_1(mp_lv_task_handler_obj, mp_lv_task_handler);
+
 static void lvgl_port_task(void *arg)
 {
     printf("Starting LVGL task\n");
-    uint32_t time_till_next_ms = 0;
-    uint32_t time_threshold_ms = 1000 / CONFIG_FREERTOS_HZ;
+    uint32_t time_till_next_ms = 5;
+    // uint32_t time_threshold_ms = 1000 / CONFIG_FREERTOS_HZ;
     while (1) {
-        _lock_acquire(&lvgl_api_lock);
-        time_till_next_ms = lv_timer_handler();
-        _lock_release(&lvgl_api_lock);
+        mp_sched_schedule((mp_obj_t)&mp_lv_task_handler_obj, mp_const_none);
         // in case of triggering a task watch dog time out
-        time_till_next_ms = MAX(time_till_next_ms, time_threshold_ms);
+        // time_till_next_ms = MAX(time_till_next_ms, time_threshold_ms);
         usleep(1000 * time_till_next_ms);
     }
 }
 
 lv_display_t *lvgl_port_init(int h_res, int v_res, esp_lcd_panel_handle_t panel_handle, esp_lcd_touch_handle_t tp_handle)
 {
-    vTaskDelay(pdMS_TO_TICKS(1000));
     printf("Initialize LVGL library\n");
     lv_init();
 
-    vTaskDelay(pdMS_TO_TICKS(1000));
     // create a lvgl display
     lv_display_t *display = lv_display_create(h_res, v_res);
 
     // alloc draw buffers used by LVGL
     // it's recommended to choose the size of the draw buffer(s) to be at least 1/10 screen sized
     size_t draw_buffer_sz = h_res * LVGL_DRAW_BUF_LINES * sizeof(lv_color16_t);
 
-    vTaskDelay(pdMS_TO_TICKS(1000));
     void *buf1 = heap_caps_aligned_alloc(4, draw_buffer_sz, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA);
     assert(buf1);
     void *buf2 = heap_caps_aligned_alloc(4, draw_buffer_sz, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA);
@@ -138,7 +143,6 @@ lv_display_t *lvgl_port_init(int h_res, int v_res, esp_lcd_panel_handle_t panel_
     // set the callback which can copy the rendered image to an area of the display
     lv_display_set_flush_cb(display, lvgl_flush_cb);
 
-    vTaskDelay(pdMS_TO_TICKS(1000));
     printf("Install LVGL tick timer\n");
     // Tick interface for LVGL (using esp_timer to generate 2ms periodic event)
     const esp_timer_create_args_t lvgl_tick_timer_args = {
@@ -151,7 +155,6 @@ lv_display_t *lvgl_port_init(int h_res, int v_res, esp_lcd_panel_handle_t panel_
 
     esp_lcd_panel_io_handle_t tp_io_handle = NULL;
 
-    vTaskDelay(pdMS_TO_TICKS(1000));
     if (tp_handle) {
         static lv_indev_t *indev;
         indev = lv_indev_create();  // Input device driver (Touch)
@@ -161,7 +164,6 @@ lv_display_t *lvgl_port_init(int h_res, int v_res, esp_lcd_panel_handle_t panel_
         lv_indev_set_read_cb(indev, lvgl_touch_cb);
     }
 
-    vTaskDelay(pdMS_TO_TICKS(1000));
     printf("Create LVGL task\n");
     xTaskCreate(lvgl_port_task, "LVGL", LVGL_TASK_STACK_SIZE, NULL, LVGL_TASK_PRIORITY, NULL);
 

ports/esp32/main_esp32s3_box3/main.c

@@ -41,7 +41,7 @@
 #include "esp_log.h"
 #include "esp_psram.h"
 
-#include "py/cstack.h"
+#include "py/stackctrl.h"
 #include "py/nlr.h"
 #include "py/compile.h"
 #include "py/runtime.h"
@@ -52,7 +52,6 @@
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/timeutils/timeutils.h"
-#include "shared/tinyusb/mp_usbd.h"
 #include "mbedtls/platform_time.h"
 
 #include "uart.h"
@@ -75,18 +74,15 @@
 #include "lvgl_port.h"
 
 // MicroPython runs as a task under FreeRTOS
-#define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 2)
+#define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
 
-typedef struct _native_code_node_t {
-    struct _native_code_node_t *next;
-    uint32_t data[];
-} native_code_node_t;
-
-static native_code_node_t *native_code_head = NULL;
-
-static void esp_native_code_free_all(void);
+// Set the margin for detecting stack overflow, depending on the CPU architecture.
+#if CONFIG_IDF_TARGET_ESP32C3
+#define MP_TASK_STACK_LIMIT_MARGIN (2048)
+#else
+#define MP_TASK_STACK_LIMIT_MARGIN (1024)
+#endif
 
-static const char *TAG = "main";
 static void init_lvgl_port();
 
 int vprintf_null(const char *format, va_list ap) {
@@ -108,9 +104,9 @@ void mp_task(void *pvParameter) {
     #if MICROPY_PY_THREAD
     mp_thread_init(pxTaskGetStackStart(NULL), MICROPY_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
-    #if MICROPY_HW_ESP_USB_SERIAL_JTAG
-    usb_serial_jtag_init();
-    #elif MICROPY_HW_ENABLE_USBDEV
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    // usb_serial_jtag_init();
+    #elif CONFIG_USB_OTG_SUPPORTED
     // usb_init();
     #endif
     #if MICROPY_HW_ENABLE_UART_REPL
@@ -134,12 +130,15 @@ void mp_task(void *pvParameter) {
 
 soft_reset:
     // initialise the stack pointer for the main thread
-    mp_cstack_init_with_top((void *)sp, MICROPY_TASK_STACK_SIZE);
+    mp_stack_set_top((void *)sp);
+    mp_stack_set_limit(MICROPY_TASK_STACK_SIZE - MP_TASK_STACK_LIMIT_MARGIN);
     gc_init(mp_task_heap, mp_task_heap + MICROPY_GC_INITIAL_HEAP_SIZE);
     mp_init();
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     readline_init0();
 
+    MP_STATE_PORT(native_code_pointers) = MP_OBJ_NULL;
+
     // initialise peripherals
     machine_pins_init();
     #if MICROPY_PY_MACHINE_I2S
@@ -192,10 +191,17 @@ void mp_task(void *pvParameter) {
     mp_thread_deinit();
     #endif
 
-    gc_sweep_all();
-
     // Free any native code pointers that point to iRAM.
-    esp_native_code_free_all();
+    if (MP_STATE_PORT(native_code_pointers) != MP_OBJ_NULL) {
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_list_get(MP_STATE_PORT(native_code_pointers), &len, &items);
+        for (size_t i = 0; i < len; ++i) {
+            heap_caps_free(MP_OBJ_TO_PTR(items[i]));
+        }
+    }
+
+    gc_sweep_all();
 
     mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
 
@@ -235,31 +241,25 @@ void nlr_jump_fail(void *val) {
     esp_restart();
 }
 
-static void esp_native_code_free_all(void) {
-    while (native_code_head != NULL) {
-        native_code_node_t *next = native_code_head->next;
-        heap_caps_free(native_code_head);
-        native_code_head = next;
-    }
-}
-
 void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     len = (len + 3) & ~3;
-    size_t len_node = sizeof(native_code_node_t) + len;
-    native_code_node_t *node = heap_caps_malloc(len_node, MALLOC_CAP_EXEC);
-    if (node == NULL) {
-        m_malloc_fail(len_node);
+    uint32_t *p = heap_caps_malloc(len, MALLOC_CAP_EXEC);
+    if (p == NULL) {
+        m_malloc_fail(len);
+    }
+    if (MP_STATE_PORT(native_code_pointers) == MP_OBJ_NULL) {
+        MP_STATE_PORT(native_code_pointers) = mp_obj_new_list(0, NULL);
     }
-    node->next = native_code_head;
-    native_code_head = node;
-    void *p = node->data;
+    mp_obj_list_append(MP_STATE_PORT(native_code_pointers), MP_OBJ_TO_PTR(p));
     if (reloc) {
         mp_native_relocate(reloc, buf, (uintptr_t)p);
     }
     memcpy(p, buf, len);
     return p;
 }
 
+MP_REGISTER_ROOT_POINTER(mp_obj_t native_code_pointers);
+
 static void init_lvgl_port()
 {
     printf("Turn off LCD backlight\n");
@@ -285,7 +285,6 @@ static void init_lvgl_port()
     esp_lcd_touch_handle_t tp_handle = NULL;
     bsp_touch_new(&touch_cfg, &tp_handle);
 
-    vTaskDelay(pdMS_TO_TICKS(2000));
     lv_display_t *disp = lvgl_port_init(BSP_LCD_H_RES, BSP_LCD_V_RES, panel_handle, tp_handle);
 
     printf("Register io panel event callback for LVGL flush ready notification\n");