Merge branch 'master' of https://gitee.com/bnu_mixly/mixly3

boards/default_src/micropython_esp32s3/origin/build/lib/camera.py

@@ -25,4 +25,10 @@ class GC032A(Camera):
 
     def deinit(self):
         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()

common/modules/mixly-modules/web/burn-upload.js

@@ -285,8 +285,10 @@ BU.burnWithEsptool = async (binFile, erase) => {
     } catch (error) {
         Debug.error(error);
         statusBarTerminal.addValue(`\n${error.toString()}\n`);
-        if (port.connected) {
+        try {
             await transport.disconnect();
+        } catch (error) {
+            Debug.error(error);
         }
         BU.progressLayer.hide();
         return;
@@ -309,8 +311,10 @@ BU.burnWithEsptool = async (binFile, erase) => {
     } catch (error) {
         statusBarTerminal.addValue("Failed!\n" + Msg.Lang['shell.bin.readFailed'] + "！\n");
         statusBarTerminal.addValue("\n" + e + "\n", true);
-        if (port.connected) {
+        try {
             await transport.disconnect();
+        } catch (error) {
+            Debug.error(error);
         }
         BU.progressLayer.hide();
         return;
@@ -338,8 +342,10 @@ BU.burnWithEsptool = async (binFile, erase) => {
         BU.progressLayer.hide();
         statusBarTerminal.addValue(`==${Msg.Lang['shell.burnFailed']}==\n`);
     } finally {
-        if (port.connected) {
+        try {
             await transport.disconnect();
+        } catch (error) {
+            Debug.error(error);
         }
     }
 }