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);