micrOSDevToolKit 2.9.8__tar.gz → 2.9.9__tar.gz

{microsdevtoolkit-2.9.8/micrOSDevToolKit.egg-info → microsdevtoolkit-2.9.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.9.8
+Version: 2.9.9
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -89,7 +89,7 @@
             0
         ],
         "urequests.py": [
-            9.02,
+            9.04,
             5
         ],
         "LM_roboarm.py": [
@@ -315,7 +315,7 @@
     },
     "summary": {
         "core": [
-            3358,
+            3363,
             23
         ],
         "load": [

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9}/micrOS/source/urequests.py

@@ -221,7 +221,12 @@ async def arequest(method, url, data=None, json=None, headers=None, sock_size=25
     except Exception as e:
         status_code = 500
         # https://github.com/micropython/micropython/blob/8785645a952c03315dbf93667b5f7c7eec49762f/cc3200/simplelink/include/device.h
-        body = "[WARN] arequest ASSOC_REJECT" if "-104" == str(e) else f"[ERR] arequest failed: {e}"
+        if "-104" == str(e):
+            body = "[WARN] arequest: ASSOC_REJECT"
+        elif "ECONNABORTED" in str(e):
+            body = f"[WARN] arequest: {e}"
+        else:
+            body = f"[ERR] arequest: {e}"
         errlog_add(body)
     finally:
         if writer:

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.9.8
+Version: 2.9.9
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9}/setup.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 import setuptools
-import platform
 
 # https://towardsdatascience.com/create-your-custom-python-package-that-you-can-pip-install-from-your-git-repository-f90465867893
 
@@ -18,7 +17,7 @@ dependencies = ['adafruit-ampy', 'mpremote', 'esptool', 'ipaddress', 'netaddr',
 
 setuptools.setup(
     name='micrOSDevToolKit',
-    version='2.9.8',
+    version='2.9.9',
     author='Marcell Ban',
     author_email='miros.framework@gmail.com',
     description='Development and deployment environment for micrOS, the diy micropython automation OS (IoT)',

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9}/toolkit/DevEnvUSB.py

@@ -65,12 +65,13 @@ class USB(Compile):
                  {'erase': '{esptool_interface} --chip esp32s3 --port {dev} erase_flash',
                   'deploy': '{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
                   'mpremote_cmd': 'mpremote',
-                  'cmd_line_info': '[!!!] Fully automatic deployment.'},
+                  'cmd_line_info': '[!HINNT!] Press boot button under connecting the board over USB: enables flash erase'},
              'esp32s3':
                  {'erase': '{esptool_interface} --chip esp32s3 --port {dev} erase_flash',
                   'deploy': '{esptool_interface} --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
                   'mpremote_cmd': 'mpremote',
-                  'cmd_line_info': '[!!!] Fully automatic deployment.'},
+                  #'ampy_cmd': 'ampy -p {dev} -b 115200 -d 2 {args}',
+                  'cmd_line_info': '[!HINNT!] Press boot button under connecting board over USB: enables flash erase'},
              'esp32c3':
                  {'erase': '{esptool_interface} --chip esp32c3 --port {dev} erase_flash',
                   'deploy': '{esptool_interface} --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}',
@@ -239,7 +240,7 @@ class USB(Compile):
                 # Legacy ampy command (esp32 auto reboot tolerance...)
                 command = self.dev_types_and_cmds[self.selected_device_type]['ampy_cmd'].format(dev=device, args=f'put {source}')
             else:
-                command = f'{mpremote_cmd} cp {source} :{source}'
+                command = f'{mpremote_cmd} fs cp {source} :{source}'     # new mpremote <1.24.1
             if ' ' in source:
                 self.console("[{}%][SKIP] micrOS deploy via USB: {}".format(percent, command))
                 continue
@@ -614,7 +615,7 @@ class USB(Compile):
             # Legacy ampy command (esp32 auto reboot tolerance...)
             command = self.dev_types_and_cmds[self.selected_device_type]['ampy_cmd'].format(dev=device, args='get node_config.json')
         else:
-            command = f'{mpremote_cmd} cat node_config.json'
+            command = f'{mpremote_cmd} fs cat node_config.json'     # new mpremote <1.24.1
         if not self.dry_run:
             exitcode, stdout, stderr = LocalMachine.CommandHandler.run_command(command, shell=True)
             self._archive_node_config()
@@ -671,7 +672,7 @@ class USB(Compile):
             # Legacy ampy command (esp32 auto reboot tolerance...)
             command = self.dev_types_and_cmds[self.selected_device_type]['ampy_cmd'].format(dev=device, args='ls')
         else:
-            command = f"{mpremote_cmd} ls"
+            command = f"{mpremote_cmd} fs ls"       # new mpremote <1.24.1
         if not self.dry_run:
             self.console("CMD: {}".format(command))
             exitcode, stdout, stderr = LocalMachine.CommandHandler.run_command(command, shell=True, debug=False)

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9}/toolkit/dashboard_apps/BackupRestore.py

@@ -110,10 +110,6 @@ def restore():
         conf_cmd_list.append(f"{key} {value}")
     conf_cmd_list.append("reboot")
 
-    verify = input(f"{Colors.WARN}This is BETA feature, are you sure?{Colors.NC} [YY/n]: ")
-    if verify != "YY":
-        print(f"{Colors.WARN}SKIP restore...{Colors.NC}")
-        return
     # Restore
     print(f"APPLY CONFIG DIFFS...{DEVICE}")
     status, answer = run_command(conf_cmd_list)

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.9}/toolkit/lib/micrOSClient.py

@@ -280,7 +280,7 @@ class micrOSClient:
         f_delta_t = "{}[{:.2f}]{}".format(color.OKGREEN, delta_time, color.NC)
         self.dbg_print("{}[⏰] {} {}reply: {}{}".format(f_delta_t, cmd, color.BOLD, out, color.NC))
 
-        # return output list
+        # return output list or None
         return out
 
     def send_cmd_retry(self, cmd, timeout=6, retry=5, stream=False):
@@ -317,10 +317,13 @@ class micrOSClient:
                 cmd = input()               # CANNOT contain prompt - it is coming back from response data
                 # send command
                 output = self.send_cmd(cmd, timeout=timeout, stream=True)
-                if history is not None and "Shell: for hints type help." not in output:   # History: Beta feature
+                if not (history is None or output is None) and "Shell: for hints type help." not in output:   # History: Beta feature
                     history.add_history(cmd)
                 if 'Bye!' in str(output):
                     break
+                if output is None:
+                    print("Exiting... client disconnected")
+                    break
             except KeyboardInterrupt:
                 print("Exiting...")
                 break