From 4f6ec33e8957a86057b1c7e40233c651d0028e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Mon, 20 Jan 2025 08:48:25 +0800 Subject: [PATCH] =?UTF-8?q?Update:=20=E8=B0=83=E6=95=B4micropython=5Fesp32?= =?UTF-8?q?c2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards/default/micropython_esp32c2/config.json | 2 +- .../micropython_esp32c2/origin/config.json | 2 +- common/modules/mixly-modules/web/serial.js | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/boards/default/micropython_esp32c2/config.json b/boards/default/micropython_esp32c2/config.json index 642b10a4..0e292b71 100644 --- a/boards/default/micropython_esp32c2/config.json +++ b/boards/default/micropython_esp32c2/config.json @@ -68,7 +68,7 @@ "devices": { "serial": true, "hid": true, - "usb": false + "usb": true }, "burn": { "erase": true, diff --git a/boards/default_src/micropython_esp32c2/origin/config.json b/boards/default_src/micropython_esp32c2/origin/config.json index 642b10a4..0e292b71 100644 --- a/boards/default_src/micropython_esp32c2/origin/config.json +++ b/boards/default_src/micropython_esp32c2/origin/config.json @@ -68,7 +68,7 @@ "devices": { "serial": true, "hid": true, - "usb": false + "usb": true }, "burn": { "erase": true, diff --git a/common/modules/mixly-modules/web/serial.js b/common/modules/mixly-modules/web/serial.js index 6a9d7c19..f6dded09 100644 --- a/common/modules/mixly-modules/web/serial.js +++ b/common/modules/mixly-modules/web/serial.js @@ -20,8 +20,10 @@ const { const { BOARD } = Config; let Device = SerialPort; +const platform = goog.platform(); +const fullPlatform = goog.fullPlatform(); -if (goog.platform() === 'win32' && goog.fullPlatform() !== 'win10') { +if (platform === 'win32' && fullPlatform !== 'win10') { if (BOARD?.web?.devices?.hid) { Device = HID; } else if (BOARD?.web?.devices?.serial) { @@ -33,8 +35,12 @@ if (goog.platform() === 'win32' && goog.fullPlatform() !== 'win10') { Device = USBMini; } } -} else if (goog.platform() === 'android') { - Device = USB; +} else if (fullPlatform === 'android') { + if (['BBC micro:bit', 'Mithon CC'].includes(BOARD.boardType)) { + Device = USB; + } else { + Device = USBMini; + } } else { if (BOARD?.web?.devices?.serial) { Device = SerialPort;