From 2be8cb8b4ce2a6ab76b13ada5fe2629e7fccce12 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 Oct 2025 22:03:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(core):=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=B2=E5=8F=A3=E6=B3=A2?=
 =?UTF-8?q?=E7=89=B9=E7=8E=87=E8=AE=BE=E7=BD=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/modules/mixly-modules/common/serial.js     | 6 +++++-
 common/modules/mixly-modules/electron/serial.js   | 2 +-
 common/modules/mixly-modules/web-socket/serial.js | 2 +-
 common/modules/mixly-modules/web/serialport.js    | 2 +-
 common/modules/mixly-modules/web/usb-mini.js      | 2 +-
 common/modules/mixly-modules/web/usb.js           | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/modules/mixly-modules/common/serial.js b/common/modules/mixly-modules/common/serial.js
index 06c00045..175aeb96 100644
--- a/common/modules/mixly-modules/common/serial.js
+++ b/common/modules/mixly-modules/common/serial.js
@@ -107,7 +107,7 @@ class Serial {
     #bufferLength_ = 0;
     #encoder_ = new TextEncoder('utf8');
     #decoder_ = new TextDecoder('utf8');
-    #baud_ = 115200;
+    #baud_ = 0;
     #dtr_ = false;
     #rts_ = false;
     #isOpened_ = false;
@@ -254,6 +254,10 @@ class Serial {
     }
 
     getBaudRate() {
+        return this.#baud_ || Serial.getConfig().baudRates;
+    }
+
+    getRawBaudRate() {
         return this.#baud_;
     }
 
diff --git a/common/modules/mixly-modules/electron/serial.js b/common/modules/mixly-modules/electron/serial.js
index 43b38571..22f4a6db 100644
--- a/common/modules/mixly-modules/electron/serial.js
+++ b/common/modules/mixly-modules/electron/serial.js
@@ -180,7 +180,7 @@ class ElectronSerial extends Serial {
     async setBaudRate(baud) {
         return new Promise((resolve, reject) => {
             if (!this.isOpened()
-                || this.getBaudRate() === baud
+                || this.getRawBaudRate() === baud
                 || !this.baudRateIsLegal(baud)) {
                 resolve();
                 return;
diff --git a/common/modules/mixly-modules/web-socket/serial.js b/common/modules/mixly-modules/web-socket/serial.js
index 24616e6b..644c7125 100644
--- a/common/modules/mixly-modules/web-socket/serial.js
+++ b/common/modules/mixly-modules/web-socket/serial.js
@@ -227,7 +227,7 @@ class WebSocketSerial extends Serial {
     async setBaudRate(baud) {
         return new Promise((resolve, reject) => {
             if (!this.isOpened()
-                || this.getBaudRate() === baud
+                || this.getRawBaudRate() === baud
                 || !this.baudRateIsLegal(baud)) {
                 resolve();
                 return;
diff --git a/common/modules/mixly-modules/web/serialport.js b/common/modules/mixly-modules/web/serialport.js
index 37db43ef..a264ed39 100644
--- a/common/modules/mixly-modules/web/serialport.js
+++ b/common/modules/mixly-modules/web/serialport.js
@@ -183,7 +183,7 @@ class WebSerialPort extends Serial {
 
     async setBaudRate(baud) {
         if (!this.isOpened()
-            || this.getBaudRate() === baud
+            || this.getRawBaudRate() === baud
             || !this.baudRateIsLegal(baud)) {
             return;
         }
diff --git a/common/modules/mixly-modules/web/usb-mini.js b/common/modules/mixly-modules/web/usb-mini.js
index 819e7486..a1ff2be5 100644
--- a/common/modules/mixly-modules/web/usb-mini.js
+++ b/common/modules/mixly-modules/web/usb-mini.js
@@ -234,7 +234,7 @@ class USBMini extends Serial {
     }
 
     async setBaudRate(baud) {
-        if (!this.isOpened() || this.getBaudRate() === baud) {
+        if (!this.isOpened() || this.getRawBaudRate() === baud) {
             return;
         }
         await super.setBaudRate(baud);
diff --git a/common/modules/mixly-modules/web/usb.js b/common/modules/mixly-modules/web/usb.js
index 4d957f0e..dde514d9 100644
--- a/common/modules/mixly-modules/web/usb.js
+++ b/common/modules/mixly-modules/web/usb.js
@@ -188,7 +188,7 @@ class USB extends Serial {
     }
 
     async setBaudRate(baud) {
-        if (!this.isOpened() || this.getBaudRate() === baud) {
+        if (!this.isOpened() || this.getRawBaudRate() === baud) {
             return;
         }
         await this.#dapLink_.setSerialBaudrate(baud);