esp32: Fix.

Vincent1-python · Vincent1-python · commit 120ce0f67d76 · 2025-08-19T11:13:32.000+08:00
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.cmake
@@ -2,5 +2,6 @@ set(IDF_TARGET esp32p4)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.p4
 	boards/ESP32_GENERIC_P4/sdkconfig.board
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board
@@ -1,31 +1,3 @@
-
-# Flash
-CONFIG_FLASHMODE_QIO=y 
-#CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHMODE="dio"
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-
-# Memory
-CONFIG_SPIRAM=y
-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
-CONFIG_SPIRAM_MODE_HEX=y
-CONFIG_SPIRAM_SPEED_200M=y
-CONFIG_SPIRAM_MEMTEST=
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=50768
-
-
-# ULP : not fixed
-CONFIG_SOC_ULP_SUPPORTED=n
-CONFIG_ULP_COPROC_ENABLED=n
-CONFIG_ULP_COPROC_TYPE_FSM=n
-
-
 # Wifi
 #CONFIG_ESP_HOSTED_ENABLED=n
 CONFIG_ESP_HOST_WIFI_ENABLED=y
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.cmake b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.cmake
@@ -2,5 +2,6 @@ set(IDF_TARGET esp32p4)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.p4
 	boards/ESP32_GENERIC_P4/sdkconfig.board
 )
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.h b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.h
@@ -2,7 +2,7 @@
 // specified.
 
 #ifndef MICROPY_HW_BOARD_NAME
-#define MICROPY_HW_BOARD_NAME "Generic ESP32P4 module"
+#define MICROPY_HW_BOARD_NAME "Generic ESP32P4 module (wifi) "
 #endif
 
 #ifndef MICROPY_HW_MCU_NAME
diff --git a/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board b/ports/esp32/boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board
@@ -1,32 +1,3 @@
-
-# Flash
-CONFIG_FLASHMODE_QIO=y 
-#CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
-CONFIG_ESPTOOLPY_FLASHMODE="dio"
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_ESPTOOLPY_AFTER_NORESET=y
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-
-# Memory
-CONFIG_SPIRAM=y
-CONFIG_IDF_EXPERIMENTAL_FEATURES=y
-CONFIG_SPIRAM_MODE_HEX=y
-CONFIG_SPIRAM_SPEED_200M=y
-CONFIG_SPIRAM_MEMTEST=
-CONFIG_SPIRAM_IGNORE_NOTFOUND=y
-CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=50768
-
-
-# ULP : not fixed
-CONFIG_SOC_ULP_SUPPORTED=n
-CONFIG_ULP_COPROC_ENABLED=n
-CONFIG_ULP_COPROC_TYPE_FSM=n
-
-
-
 # Wifi
 CONFIG_ESP_HOSTED_ENABLED=y
 #CONFIG_ESP_HOST_WIFI_ENABLED=y
diff --git a/ports/esp32/boards/sdkconfig.p4 b/ports/esp32/boards/sdkconfig.p4
@@ -0,0 +1,23 @@
+# Flash
+CONFIG_FLASHMODE_QIO=y 
+#CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+
+# Memory
+CONFIG_SPIRAM=y
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+CONFIG_SPIRAM_MODE_HEX=y
+CONFIG_SPIRAM_SPEED_200M=y
+CONFIG_SPIRAM_MEMTEST=
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=50768
+
+
+# ULP : not fixed
+CONFIG_SOC_ULP_SUPPORTED=n
+CONFIG_ULP_COPROC_ENABLED=n
+CONFIG_ULP_COPROC_TYPE_FSM=n
diff --git a/ports/esp32/boards/sdkconfig.p4usb b/ports/esp32/boards/sdkconfig.p4usb
@@ -1,3 +1,2 @@
 CONFIG_USB_OTG_SUPPORTED=y
 CONFIG_TINYUSB_CDC_ENABLED=y
-CONFIG_TINYUSB_HID_COUNT=1
diff --git a/ports/esp32/boards/sdkconfig.usb b/ports/esp32/boards/sdkconfig.usb
@@ -1,5 +1,4 @@
 CONFIG_USB_OTG_SUPPORTED=y
 CONFIG_TINYUSB_CDC_ENABLED=y
-CONFIG_TINYUSB_HID_COUNT=1
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=256
 CONFIG_TINYUSB_CDC_TX_BUFSIZE=256
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the MicroPython project, http://micropython.org/
+ * This file is part of the MicroPython project, http://micropython.org/  
  *
  * The MIT License (MIT)
  *
@@ -68,7 +68,7 @@
 
 #define I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-// ---------------- 内部数据结构 ----------------
+// ---------------- Internal Data Structures ----------------
 typedef struct _machine_hw_i2c_obj_t {
     mp_obj_base_t base;
     i2c_master_bus_handle_t bus_handle;
@@ -80,21 +80,21 @@ typedef struct _machine_hw_i2c_obj_t {
 
 static machine_hw_i2c_obj_t machine_hw_i2c_obj[I2C_NUM_MAX];
 
-// ---------------- 初始化 ----------------
+// ---------------- Initialization ----------------
 static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self,
                                 uint32_t freq,
                                 uint32_t timeout_us,
                                 bool first_init) {
      
-    // 1. 若已初始化，先卸载旧驱动
+    // 1. If already initialized, first remove the old driver
     if (!first_init && self->bus_handle) {
         i2c_master_bus_rm_device(self->dev_handle);
         i2c_del_master_bus(self->bus_handle);
         self->bus_handle = NULL;
         self->dev_handle = NULL;
     }
 
-    // 2. 配置总线
+    // 2. Configure the bus
     i2c_master_bus_config_t bus_cfg = {
         .i2c_port = self->port,
         .scl_io_num = self->scl,
@@ -105,10 +105,10 @@ static void machine_hw_i2c_init(machine_hw_i2c_obj_t *self,
     };
     ESP_ERROR_CHECK(i2c_new_master_bus(&bus_cfg, &self->bus_handle));
 
-    // 3. 添加设备（占位地址，后面真正传输时再动态改）
+    // 3. Add device (placeholder address, dynamically changed later during actual transmission)
     i2c_device_config_t dev_cfg = {
         .dev_addr_length = I2C_ADDR_BIT_LEN_7,
-        .device_address = 0x00,               // 占位
+        .device_address = 0x00,               // Placeholder
         .scl_speed_hz = freq,
     };
     ESP_ERROR_CHECK(i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &self->dev_handle));
@@ -122,16 +122,16 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in,
 {
     machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    /* 0. 先探测地址是否有设备回应 */
+    /* 0. First, probe the address to see if a device responds */
     esp_err_t err = i2c_master_probe(self->bus_handle, addr, 1000);
     if (err != ESP_OK) {
-        return -MP_ENODEV;          /* 地址无设备，直接返回 */
+        return -MP_ENODEV;          /* No device at address, return directly */
     }
-    /* 1. 为本次事务创建临时 device 句柄 */
+    /* 1. Create a temporary device handle for this transaction */
     i2c_device_config_t dev_cfg = {
         .dev_addr_length = I2C_ADDR_BIT_LEN_7,
         .device_address  = addr,
-        .scl_speed_hz    = 100000,   /* 沿用总线频率即可 */
+        .scl_speed_hz    = 100000,   /* Use the bus frequency */
     };
     i2c_master_dev_handle_t dev_handle;
     err = i2c_master_bus_add_device(self->bus_handle, &dev_cfg, &dev_handle);
@@ -141,21 +141,21 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in,
 
     int data_len = 0;
 
-    /* 2. 若有 WRITE1 段，先写一段 */
+    /* 2. If there is a WRITE1 segment, write it first */
     if (flags & MP_MACHINE_I2C_FLAG_WRITE1) {
         if (bufs->len) {
             err = i2c_master_transmit(dev_handle,
                                       bufs->buf,
                                       bufs->len,
-                                      1000);                 /* 阻塞超时 1 s */
+                                      1000);                 /* Blocking timeout 1 s */
             if (err != ESP_OK) goto cleanup;
         }
         data_len += bufs->len;
         --n;
         ++bufs;
     }
     if (flags & MP_MACHINE_I2C_FLAG_READ) {
-	    /* 3. 主循环：剩余段 */
+	    /* 3. Main loop: remaining segments */
 	    for (; n--; ++bufs) {
 		if (bufs->len == 0) continue;
                 err = i2c_master_receive(dev_handle,
@@ -168,52 +168,52 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in,
                 data_len += bufs->len;
     }
     } else {
-        // 写操作逻辑
+        // Write operation logic
         size_t total_len = 0;
-        mp_machine_i2c_buf_t *original_bufs = bufs;  // 保存原始指针
-        size_t yuann=n;
+        mp_machine_i2c_buf_t *original_bufs = bufs;  // Save the original pointer
+        size_t old_n=n;
 
-        // 计算总长度
+        // Calculate total length
         for (; n--; ++bufs) {
             total_len += bufs->len;
         }
 
-        // 重置指针
+        // Reset pointer
         bufs = original_bufs;
-	// 重置n
-        n = yuann;
-        // 动态分配 write_buf
+	// Reset n
+        n = old_n;
+        // Dynamically allocate write_buf
         uint8_t *write_buf = (uint8_t *)malloc(total_len);
         if (write_buf == NULL) return -MP_ENOMEM;
 
-        // 复制数据到 write_buf
+        // Copy data to write_buf
         size_t index = 0;
         for (; n--; ++bufs) {
             memcpy(write_buf + index, bufs->buf, bufs->len);
             index += bufs->len;
         }
 
-        // 发送数据
+        // Send data
         err = i2c_master_transmit(dev_handle, write_buf, total_len, 1000);
         if (err != ESP_OK) goto cleanup;
 
-        // 释放动态分配的内存
+        // Free dynamically allocated memory
         free(write_buf);
     }
 
 cleanup:
-    /* 4. 立即销毁临时句柄 */
+    /* 4. Immediately destroy the temporary handle */
     i2c_master_bus_rm_device(dev_handle);
 
-    /* 5. 出错映射 */
+    /* 5. Error mapping */
     if (err == ESP_FAIL)        return -MP_ENODEV;
     if (err == ESP_ERR_TIMEOUT) return -MP_ETIMEDOUT;
     if (err != ESP_OK)          return -abs(err);
 
     return data_len;
 }
 
-// ---------------- 打印 ----------------
+// ---------------- Printing ----------------
 static void machine_hw_i2c_print(const mp_print_t *print,
                                  mp_obj_t self_in,
                                  mp_print_kind_t kind) {
@@ -222,7 +222,7 @@ static void machine_hw_i2c_print(const mp_print_t *print,
               self->port, self->scl, self->sda);
 }
 
-// ---------------- 构造函数 ----------------
+// ---------------- Constructor ----------------
 mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type,
                                  size_t n_args, size_t n_kw,
                                  const mp_obj_t *all_args) {
@@ -272,7 +272,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type,
     return MP_OBJ_FROM_PTR(self);
 }
 
-// ---------------- 协议表 ----------------
+// ---------------- Protocol Table ----------------
 static const mp_machine_i2c_p_t machine_hw_i2c_p = {
     .transfer_supports_write1 = true,
     .transfer = machine_hw_i2c_transfer,
diff --git a/shared/tinyusb/mp_usbd.c b/shared/tinyusb/mp_usbd.c
@@ -63,52 +63,4 @@ void mp_usbd_hex_str(char *out_str, const uint8_t *bytes, size_t bytes_len) {
     }
     out_str[hex_len] = 0;
 }
-#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32P4 
-const uint8_t hid_report_descriptor[] = {
-    TUD_HID_REPORT_DESC_KEYBOARD(HID_REPORT_ID(HID_ITF_PROTOCOL_KEYBOARD)),
-    TUD_HID_REPORT_DESC_MOUSE(HID_REPORT_ID(HID_ITF_PROTOCOL_MOUSE))
-};
-
-/**
- * @brief String descriptor
- */
-const char* hid_string_descriptor[5] = {
-    // array of pointer to string descriptors
-    (char[]){0x09, 0x04},  // 0: is supported language is English (0x0409)
-    "TinyUSB",             // 1: Manufacturer
-    "TinyUSB Device",      // 2: Product
-    "123456",              // 3: Serials, should use chip ID
-    "Example HID interface",  // 4: HID
-};
-
-/********* TinyUSB HID callbacks ***************/
-
-// Invoked when received GET HID REPORT DESCRIPTOR request
-// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
-uint8_t const *tud_hid_descriptor_report_cb(uint8_t instance)
-{
-    // We use only one interface and one HID report descriptor, so we can ignore parameter 'instance'
-    return hid_report_descriptor;
-}
-
-// Invoked when received GET_REPORT control request
-// Application must fill buffer report's content and return its length.
-// Return zero will cause the stack to STALL request
-uint16_t tud_hid_get_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen)
-{
-    (void) instance;
-    (void) report_id;
-    (void) report_type;
-    (void) buffer;
-    (void) reqlen;
-
-    return 0;
-}
-
-// Invoked when received SET_REPORT control request or
-// received data on OUT endpoint ( Report ID = 0, Type = 0 )
-void tud_hid_set_report_cb(uint8_t instance, uint8_t report_id, hid_report_type_t report_type, uint8_t const* buffer, uint16_t bufsize)
-{
-}
-#endif
 #endif // MICROPY_HW_ENABLE_USBDEV
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
@@ -73,12 +73,6 @@
 #define CFG_TUD_CDC             (0)
 #endif
 
-#if MICROPY_HW_USB_HID
-#define CFG_TUD_HID             (1)
-#else
-#define CFG_TUD_HID             (0)
-#endif
-
 #if MICROPY_HW_USB_MSC
 #define CFG_TUD_MSC             (1)
 #else

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@ set(IDF_TARGET esp32p4)`
`2`	`2`
`3`	`3`	`set(SDKCONFIG_DEFAULTS`
`4`	`4`	`boards/sdkconfig.base`
	`5`	`+ boards/sdkconfig.p4`
`5`	`6`	`boards/ESP32_GENERIC_P4/sdkconfig.board`
`6`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`CONFIG_USB_OTG_SUPPORTED=y`
`2`	`2`	`CONFIG_TINYUSB_CDC_ENABLED=y`
`3`		`-CONFIG_TINYUSB_HID_COUNT=1`