18069996051/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 在线版设置选中串口后继续 烧录 和 上传 操作

Browse Source
This commit is contained in:
王立帮
2024-10-12 21:25:23 +08:00
parent 0e42ca74d4
commit f82839e936
3 changed files with 49 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
common/modules/mixly-modules/web/burn-upload.js
View File

@@ -59,11 +59,11 @@ BU.FILMWARE_LAYER = new HTMLTemplate(
const BAUD = goog.platform() === 'darwin' ? 460800 : 921600;
BU.requestPort = () => {
BU.requestPort = async () => {
if (SELECTED_BOARD.web.com === 'usb') {
USB.requestPort();
await USB.requestPort();
} else {
Serial.requestPort();
await Serial.requestPort();
}
}
@@ -225,13 +225,18 @@ BU.burnByUSB = () => {
BU.burnWithEsptool = async (binFile) => {
const { mainStatusBarTabs } = Mixly;
const portName = Serial.getSelectedPortName();
let portName = Serial.getSelectedPortName();
if (!portName) {
/*layer.msg(Msg.Lang['statusbar.serial.noDevice'], {
time: 1000
});*/
BU.requestPort();
return;
try {
await BU.requestPort();
portName = Serial.getSelectedPortName();
if (!portName) {
return;
}
} catch (error) {
Debug.error(error);
return;
}
}
const statusBarSerial = mainStatusBarTabs.getStatusBarById(portName);
if (statusBarSerial) {
@@ -337,13 +342,18 @@ BU.burnWithEsptool = async (binFile) => {
BU.burnWithAdafruitEsptool = async (binFile) => {
const { mainStatusBarTabs } = Mixly;
const portName = Serial.getSelectedPortName();
let portName = Serial.getSelectedPortName();
if (!portName) {
/*layer.msg(Msg.Lang['statusbar.serial.noDevice'], {
time: 1000
});*/
BU.requestPort();
return;
try {
await BU.requestPort();
portName = Serial.getSelectedPortName();
if (!portName) {
return;
}
} catch (error) {
Debug.error(error);
return;
}
}
const statusBarSerial = mainStatusBarTabs.getStatusBarById(portName);
if (statusBarSerial) {
@@ -504,14 +514,19 @@ BU.searchLibs = (moduleList, libList = []) => {
return libList;
}
BU.initUpload = () => {
const portName = Serial.getSelectedPortName();
BU.initUpload = async () => {
let portName = Serial.getSelectedPortName();
if (!portName) {
/*layer.msg(Msg.Lang['statusbar.serial.noDevice'], {
time: 1000
});*/
BU.requestPort();
return;
try {
await BU.requestPort();
portName = Serial.getSelectedPortName();
if (!portName) {
return;
}
} catch (error) {
Debug.error(error);
return;
}
}
BU.uploadWithAmpy(portName);
}