boards: USB CDC STRING displays incorrectly.

lbuque · lbuque · commit 0f4748bcff79 · 2024-03-07T10:51:14.000+08:00
Signed-off-by: lbuque &lt;1102390310@qq.com&gt;
diff --git a/m5stack/boards/M5STACK_AirQ/mpconfigboard.cmake b/m5stack/boards/M5STACK_AirQ/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 15)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_AirQ/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_AirQ/sdkconfig.board b/m5stack/boards/M5STACK_AirQ/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack AirQ(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_AtomS3/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 11)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_AtomS3/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_AtomS3/sdkconfig.board b/m5stack/boards/M5STACK_AtomS3/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack AtomS3(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_AtomS3U/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3U/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 138)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_AtomS3U/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_AtomS3U/sdkconfig.board b/m5stack/boards/M5STACK_AtomS3U/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack AtomS3U(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_AtomS3_Lite/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3_Lite/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 137)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_AtomS3_Lite/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_AtomS3_Lite/sdkconfig.board b/m5stack/boards/M5STACK_AtomS3_Lite/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack AtomS3Lite(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_Capsule/mpconfigboard.cmake b/m5stack/boards/M5STACK_Capsule/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 139)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_Capsule/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_Capsule/sdkconfig.board b/m5stack/boards/M5STACK_Capsule/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack Capsule(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_Cardputer/mpconfigboard.cmake b/m5stack/boards/M5STACK_Cardputer/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 14)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_Cardputer/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_Cardputer/sdkconfig.board b/m5stack/boards/M5STACK_Cardputer/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack Cardputer(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_CoreS3/sdkconfig.board b/m5stack/boards/M5STACK_CoreS3/sdkconfig.board
@@ -7,3 +7,5 @@ CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
 
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack CoreS3(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_Dial/mpconfigboard.cmake b/m5stack/boards/M5STACK_Dial/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 12)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_Dial/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_Dial/sdkconfig.board b/m5stack/boards/M5STACK_Dial/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack Dial(UiFlow2)"
diff --git a/m5stack/boards/M5STACK_StampS3/mpconfigboard.cmake b/m5stack/boards/M5STACK_StampS3/mpconfigboard.cmake
@@ -4,7 +4,7 @@ set(IDF_TARGET esp32s3)
 set(BOARD_ID 136)
 
 set(SDKCONFIG_DEFAULTS
-    ./boards/M5STACK_S3_8MB/sdkconfig.board
+    ./boards/M5STACK_StampS3/sdkconfig.board
     ./boards/sdkconfig.base
     ./boards/sdkconfig.240mhz
     ./boards/sdkconfig.disable_iram
diff --git a/m5stack/boards/M5STACK_StampS3/sdkconfig.board b/m5stack/boards/M5STACK_StampS3/sdkconfig.board
@@ -6,4 +6,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
 
 CONFIG_SPIRAM_MEMTEST=
-CONFIG_FREERTOS_UNICORE=y
+CONFIG_FREERTOS_UNICORE=y
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_CDC_STRING="M5Stack StampS3(UiFlow2)"
diff --git a/m5stack/boards/sdkconfig.usb b/m5stack/boards/sdkconfig.usb
@@ -1,19 +1,13 @@
-CONFIG_USB_ENABLED=y
-CONFIG_USB_CDC_ENABLED=y
-CONFIG_USB_CDC_RX_BUFSIZE=256
-CONFIG_USB_CDC_TX_BUFSIZE=256
-
-# M5STACK UiFlow USB description
-CONFIG_USB_DESC_USE_ESPRESSIF_VID=y
-CONFIG_USB_DESC_USE_DEFAULT_PID=n
-CONFIG_USB_DESC_CUSTOM_PID=0x8120
-CONFIG_USB_DESC_BCDDEVICE=0x0100
-CONFIG_USB_DESC_MANUFACTURER_STRING="M5Stack Technology Co., Ltd"
-CONFIG_USB_DESC_PRODUCT_STRING="M5Stack UiFlow 2.0"
-CONFIG_USB_DESC_SERIAL_STRING="UiFlow2 "
-CONFIG_USB_DESC_CDC_STRING="M5Stack UiFlow 2.0 Device"
-
 CONFIG_USB_OTG_SUPPORTED=y
 CONFIG_TINYUSB_CDC_ENABLED=y
 CONFIG_TINYUSB_CDC_RX_BUFSIZE=256
-CONFIG_TINYUSB_CDC_TX_BUFSIZE=256
+CONFIG_TINYUSB_CDC_TX_BUFSIZE=256
+
+# M5STACK UiFlow USB description
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=y
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x8120
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="M5Stack Technology Co., Ltd"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="M5Stack UiFlow 2.0"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="UiFlow2"
