From 7afb57533e589366c97274fe65b45d06d5657c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Tue, 16 Dec 2025 11:55:21 +0800 Subject: [PATCH] =?UTF-8?q?fix(core):=20=E4=BF=AE=E5=A4=8Dweb=20compiler?= =?UTF-8?q?=E4=B8=8B=E7=83=A7=E5=BD=95esp32=E5=9B=BA=E4=BB=B6=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/modules/mixly-modules/deps.json | 1 + .../mixly-modules/web-compiler/arduino-shell.js | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/modules/mixly-modules/deps.json b/common/modules/mixly-modules/deps.json index 9f665414..8f754377 100644 --- a/common/modules/mixly-modules/deps.json +++ b/common/modules/mixly-modules/deps.json @@ -1787,6 +1787,7 @@ "Mixly.Workspace", "Mixly.LayerProgress", "Mixly.Web.Serial", + "Mixly.Web.SerialTransport", "Mixly.WebCompiler" ], "provide": [ diff --git a/common/modules/mixly-modules/web-compiler/arduino-shell.js b/common/modules/mixly-modules/web-compiler/arduino-shell.js index e7639823..c1c15955 100644 --- a/common/modules/mixly-modules/web-compiler/arduino-shell.js +++ b/common/modules/mixly-modules/web-compiler/arduino-shell.js @@ -12,6 +12,7 @@ goog.require('Mixly.Msg'); goog.require('Mixly.Workspace'); goog.require('Mixly.LayerProgress'); goog.require('Mixly.Web.Serial'); +goog.require('Mixly.Web.SerialTransport'); goog.require('Mixly.WebCompiler'); goog.provide('Mixly.WebCompiler.ArduShell'); @@ -26,7 +27,7 @@ const { WebCompiler } = Mixly; -const { Serial } = Web; +const { Serial, SerialTransport } = Web; const { layer } = layui; const { ESPLoader, Transport } = esptooljs; @@ -278,13 +279,14 @@ class WebCompilerArduShell { try { const keys = Boards.getSelectedBoardKey().split(':'); if (`${keys[0]}:${keys[1]}` === 'esp32:esp32') { - baudrate = Boards.getSelectedBoardConfigParam('UploadSpeed'); + baudrate = Boards.getSelectedBoardConfigParam('UploadSpeed') || 115200; eraseAll = Boards.getSelectedBoardConfigParam('EraseFlash') === 'all'; } else { - baudrate = Boards.getSelectedBoardConfigParam('baud'); + baudrate = Boards.getSelectedBoardConfigParam('baud') || 115200; eraseAll = Boards.getSelectedBoardConfigParam('wipe') === 'all'; } - transport = new Transport(Serial.getPort(port), false); + const serial = new Serial(port); + transport = new SerialTransport(serial, false); esploader = new ESPLoader({ transport, baudrate,