From a771c7d91b8f3c980d294274fc26628b28d0b187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Fri, 20 Dec 2024 13:45:52 +0800 Subject: [PATCH] =?UTF-8?q?Update:=20=E6=9B=B4=E6=96=B0mixly-modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/modules/mixly-modules/common/serial.js | 1 + common/modules/mixly-modules/web/burn-upload.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/modules/mixly-modules/common/serial.js b/common/modules/mixly-modules/common/serial.js index a02d89e1..8d2f0278 100644 --- a/common/modules/mixly-modules/common/serial.js +++ b/common/modules/mixly-modules/common/serial.js @@ -83,6 +83,7 @@ class Serial { newOption.setAttribute('disabled', true); $portSelector.append(newOption); } + $portSelector.select2('close'); $portSelector.trigger('change'); let footerStatus = ports.length ? 'inline-flex' : 'none'; $('#mixly-footer-port-div').css('display', footerStatus); diff --git a/common/modules/mixly-modules/web/burn-upload.js b/common/modules/mixly-modules/web/burn-upload.js index a60d01ed..3b4e545d 100644 --- a/common/modules/mixly-modules/web/burn-upload.js +++ b/common/modules/mixly-modules/web/burn-upload.js @@ -201,7 +201,7 @@ BU.burnByUSB = () => { statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`); }) .catch((error) => { - console.log(error); + Debug.error(error); layer.close(index); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`); }) @@ -269,7 +269,7 @@ BU.burnWithEsptool = async (binFile, erase) => { }); let chip = await esploader.main(); } catch (error) { - console.log(error); + Debug.error(error); statusBarTerminal.addValue(`\n${error.toString()}\n`); await transport.disconnect(); return; @@ -320,7 +320,7 @@ BU.burnWithEsptool = async (binFile, erase) => { await transport.disconnect(); } catch (error) { layer.close(index); - console.log(error); + Debug.error(error); } }); try { @@ -331,7 +331,7 @@ BU.burnWithEsptool = async (binFile, erase) => { layer.msg(Msg.Lang['shell.burnSucc'], { time: 1000 }); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`); } catch (error) { - console.log(error); + Debug.error(error); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`); } finally { layer.close(index); @@ -386,7 +386,7 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => { await esploader.initialize(); espStub = await esploader.runStub(); } catch (error) { - console.log(error); + Debug.error(error); statusBarTerminal.addValue(`\n${error.toString()}\n`); await port.close(); return; @@ -446,7 +446,7 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => { layer.msg(Msg.Lang['shell.burnSucc'], { time: 1000 }); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`); } catch (error) { - console.log(error); + Debug.error(error); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`); } finally { layer.close(index); @@ -607,7 +607,7 @@ BU.uploadWithAmpy = (portName) => { } catch (error) { ampy.dispose(); layer.close(index); - console.error(error); + Debug.error(error); statusBarTerminal.addValue(`${error}\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.uploadFailed']}==\n`); } @@ -677,7 +677,7 @@ BU.uploadWithEsptool = async (endType, obj, layerType) => { Serial.reset(portName, 'upload'); mainStatusBarTabs.changeTo(portName); } catch (error) { - console.log(error); + Debug.error(error); layer.close(layerType); statusBarTerminal.addValue(`==${Msg.Lang['shell.uploadFailed']}==\n`); } finally {