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

Update: 合并master分支提交记录

Browse Source
This commit is contained in:
王立帮
2024-12-20 20:49:36 +08:00
parent a3b72c7950 a771c7d91b
commit 332470cf44
15 changed files with 65 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/css/blockly.css
View File

@@ -217,6 +217,7 @@
}
.blocklyMenu > .blocklyMenuItem {
font-family: Lato, system-ui, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
margin: 0px 5px;
border-radius: 5px;
box-sizing: content-box;

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

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

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

@@ -279,7 +279,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;
@@ -330,7 +330,7 @@ BU.burnWithEsptool = async (binFile, erase) => {
await transport.disconnect();
} catch (error) {
layer.close(index);
console.log(error);
Debug.error(error);
}
});
try {
@@ -341,7 +341,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);
@@ -396,7 +396,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;
@@ -456,7 +456,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);
@@ -724,7 +724,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`);
}
@@ -794,7 +794,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 {