From 77b54538fa82b82d326fcb75e88cacf9f6897d62 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, 7 Oct 2024 23:32:10 +0800 Subject: [PATCH] =?UTF-8?q?Update:=20=E5=B0=86xpython=E6=9D=BF=E5=8D=A1?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=20`=E7=83=A7=E5=BD=95=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E5=9B=BA=E4=BB=B6`=20=E9=80=89=E9=A1=B9=E4=B8=8E?= =?UTF-8?q?=E5=B7=B2=E6=9C=89=20`=E5=9B=BA=E4=BB=B6=E7=83=A7=E5=BD=95`=20?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/modules/mixly-modules/common/app.js | 6 +++--- common/modules/mixly-modules/electron/burn-upload.js | 7 ++++++- common/modules/mixly-modules/web/burn-upload.js | 10 +++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/common/modules/mixly-modules/common/app.js b/common/modules/mixly-modules/common/app.js index 0922d0b1..1197e706 100644 --- a/common/modules/mixly-modules/common/app.js +++ b/common/modules/mixly-modules/common/app.js @@ -507,7 +507,7 @@ class App extends Component { weight: 1 }); - this.#nav_.register({ + /*this.#nav_.register({ icon: 'icon-upload-1', id: ['setting', 'firmware'], displayText: Msg.Lang['nav.btn.setting.firmware'], @@ -521,7 +521,7 @@ class App extends Component { callback: () => BU.burnWithSpecialBin(), scopeType: Nav.Scope.RIGHT, weight: 2 - }); + });*/ this.#nav_.register({ icon: 'icon-comment-1', @@ -535,7 +535,7 @@ class App extends Component { Url.open(href); }, scopeType: Nav.Scope.RIGHT, - weight: 3 + weight: 2 }); } diff --git a/common/modules/mixly-modules/electron/burn-upload.js b/common/modules/mixly-modules/electron/burn-upload.js index 3a6bd439..66cbfa3b 100644 --- a/common/modules/mixly-modules/electron/burn-upload.js +++ b/common/modules/mixly-modules/electron/burn-upload.js @@ -361,7 +361,12 @@ BU.initBurn = function () { BU.getDisksWithVolumesName('burn', burn.volume, burn.filePath); } else { const port = Serial.getSelectedPortName(); - BU.burnWithPort(port, burn.command); + if (burn.special && burn.special instanceof Array) { + BU.burning = false; + BU.burnWithSpecialBin(); + } else { + BU.burnWithPort(port, burn.command); + } } } diff --git a/common/modules/mixly-modules/web/burn-upload.js b/common/modules/mixly-modules/web/burn-upload.js index d2c5a330..7c41eaff 100644 --- a/common/modules/mixly-modules/web/burn-upload.js +++ b/common/modules/mixly-modules/web/burn-upload.js @@ -129,10 +129,14 @@ BU.initBurn = () => { if (typeof web.burn.binFile !== 'object') { return; } - if (boardKey.indexOf('micropython:esp32s2') !== -1) { - BU.burnWithAdafruitEsptool(web.burn.binFile); + if (web.burn.special && web.burn.special instanceof Array) { + BU.burnWithSpecialBin(); } else { - BU.burnWithEsptool(web.burn.binFile); + if (boardKey.indexOf('micropython:esp32s2') !== -1) { + BU.burnWithAdafruitEsptool(web.burn.binFile); + } else { + BU.burnWithEsptool(web.burn.binFile); + } } } }