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

Update: 更新mixly-modules

Browse Source
This commit is contained in:
王立帮
2024-12-20 13:45:52 +08:00
parent 9b1d3242eb
commit a771c7d91b
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/modules/mixly-modules/common/serial.js
View File

@@ -83,6 +83,7 @@ class Serial {
newOption.setAttribute('disabled', true); newOption.setAttribute('disabled', true);
$portSelector.append(newOption); $portSelector.append(newOption);
} }
$portSelector.select2('close');
$portSelector.trigger('change'); $portSelector.trigger('change');
let footerStatus = ports.length ? 'inline-flex' : 'none'; let footerStatus = ports.length ? 'inline-flex' : 'none';
$('#mixly-footer-port-div').css('display', footerStatus); $('#mixly-footer-port-div').css('display', footerStatus);

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

@@ -201,7 +201,7 @@ BU.burnByUSB = () => {
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`);
}) })
.catch((error) => { .catch((error) => {
console.log(error); Debug.error(error);
layer.close(index); layer.close(index);
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`);
}) })
@@ -269,7 +269,7 @@ BU.burnWithEsptool = async (binFile, erase) => {
}); });
let chip = await esploader.main(); let chip = await esploader.main();
} catch (error) { } catch (error) {
console.log(error); Debug.error(error);
statusBarTerminal.addValue(`\n${error.toString()}\n`); statusBarTerminal.addValue(`\n${error.toString()}\n`);
await transport.disconnect(); await transport.disconnect();
return; return;
@@ -320,7 +320,7 @@ BU.burnWithEsptool = async (binFile, erase) => {
await transport.disconnect(); await transport.disconnect();
} catch (error) { } catch (error) {
layer.close(index); layer.close(index);
console.log(error); Debug.error(error);
} }
}); });
try { try {
@@ -331,7 +331,7 @@ BU.burnWithEsptool = async (binFile, erase) => {
layer.msg(Msg.Lang['shell.burnSucc'], { time: 1000 }); layer.msg(Msg.Lang['shell.burnSucc'], { time: 1000 });
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`);
} catch (error) { } catch (error) {
console.log(error); Debug.error(error);
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`);
} finally { } finally {
layer.close(index); layer.close(index);
@@ -386,7 +386,7 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => {
await esploader.initialize(); await esploader.initialize();
espStub = await esploader.runStub(); espStub = await esploader.runStub();
} catch (error) { } catch (error) {
console.log(error); Debug.error(error);
statusBarTerminal.addValue(`\n${error.toString()}\n`); statusBarTerminal.addValue(`\n${error.toString()}\n`);
await port.close(); await port.close();
return; return;
@@ -446,7 +446,7 @@ BU.burnWithAdafruitEsptool = async (binFile, erase) => {
layer.msg(Msg.Lang['shell.burnSucc'], { time: 1000 }); layer.msg(Msg.Lang['shell.burnSucc'], { time: 1000 });
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnSucc']}==\n`);
} catch (error) { } catch (error) {
console.log(error); Debug.error(error);
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`);
} finally { } finally {
layer.close(index); layer.close(index);
@@ -607,7 +607,7 @@ BU.uploadWithAmpy = (portName) => {
} catch (error) { } catch (error) {
ampy.dispose(); ampy.dispose();
layer.close(index); layer.close(index);
console.error(error); Debug.error(error);
statusBarTerminal.addValue(`${error}\n`); statusBarTerminal.addValue(`${error}\n`);
statusBarTerminal.addValue(`==${Msg.Lang['shell.uploadFailed']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.uploadFailed']}==\n`);
} }
@@ -677,7 +677,7 @@ BU.uploadWithEsptool = async (endType, obj, layerType) => {
Serial.reset(portName, 'upload'); Serial.reset(portName, 'upload');
mainStatusBarTabs.changeTo(portName); mainStatusBarTabs.changeTo(portName);
} catch (error) { } catch (error) {
console.log(error); Debug.error(error);
layer.close(layerType); layer.close(layerType);
statusBarTerminal.addValue(`==${Msg.Lang['shell.uploadFailed']}==\n`); statusBarTerminal.addValue(`==${Msg.Lang['shell.uploadFailed']}==\n`);
} finally { } finally {