Merge branch 'master' of https://gitee.com/bnu_mixly/mixly3
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -25,4 +25,10 @@ class GC032A(Camera):
|
|||||||
|
|
||||||
def deinit(self):
|
def deinit(self):
|
||||||
super().deinit()
|
super().deinit()
|
||||||
onboard_bot.cam_en(0,100)
|
onboard_bot.cam_en(0, 100)
|
||||||
|
|
||||||
|
def display(self, show=True):
|
||||||
|
if show:
|
||||||
|
super().display()
|
||||||
|
else:
|
||||||
|
super().display_stop()
|
||||||
|
|||||||
@@ -285,8 +285,10 @@ BU.burnWithEsptool = async (binFile, erase) => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
Debug.error(error);
|
Debug.error(error);
|
||||||
statusBarTerminal.addValue(`\n${error.toString()}\n`);
|
statusBarTerminal.addValue(`\n${error.toString()}\n`);
|
||||||
if (port.connected) {
|
try {
|
||||||
await transport.disconnect();
|
await transport.disconnect();
|
||||||
|
} catch (error) {
|
||||||
|
Debug.error(error);
|
||||||
}
|
}
|
||||||
BU.progressLayer.hide();
|
BU.progressLayer.hide();
|
||||||
return;
|
return;
|
||||||
@@ -309,8 +311,10 @@ BU.burnWithEsptool = async (binFile, erase) => {
|
|||||||
} catch (error) {
|
} catch (error) {
|
||||||
statusBarTerminal.addValue("Failed!\n" + Msg.Lang['shell.bin.readFailed'] + "!\n");
|
statusBarTerminal.addValue("Failed!\n" + Msg.Lang['shell.bin.readFailed'] + "!\n");
|
||||||
statusBarTerminal.addValue("\n" + e + "\n", true);
|
statusBarTerminal.addValue("\n" + e + "\n", true);
|
||||||
if (port.connected) {
|
try {
|
||||||
await transport.disconnect();
|
await transport.disconnect();
|
||||||
|
} catch (error) {
|
||||||
|
Debug.error(error);
|
||||||
}
|
}
|
||||||
BU.progressLayer.hide();
|
BU.progressLayer.hide();
|
||||||
return;
|
return;
|
||||||
@@ -338,8 +342,10 @@ BU.burnWithEsptool = async (binFile, erase) => {
|
|||||||
BU.progressLayer.hide();
|
BU.progressLayer.hide();
|
||||||
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`);
|
statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`);
|
||||||
} finally {
|
} finally {
|
||||||
if (port.connected) {
|
try {
|
||||||
await transport.disconnect();
|
await transport.disconnect();
|
||||||
|
} catch (error) {
|
||||||
|
Debug.error(error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user