micrOSDevToolKit 3.0.1__tar.gz → 3.0.2__tar.gz

{microsdevtoolkit-3.0.1/micrOSDevToolKit.egg-info → microsdevtoolkit-3.0.2}/PKG-INFO

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

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.2}/devToolKit.py

@@ -11,7 +11,8 @@ if len(sys.argv) > 1 and sys.argv[1] in ['light', '--light']:
 else:
     # INSTALL OPTIONAL DEPENDENCIES - PIP HACK
     from toolkit.lib import pip_package_installer as pip_install
-    pip_install.install_optional_dependencies(['PyQt5', 'opencv-python', 'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
+    pip_install.install_optional_dependencies(['PyQt5', 'PyQt5-Qt5', 'PyQt5-sip', 'opencv-python',
+                                               'PyAudio', 'mpy-cross==1.27.0.post2', 'matplotlib'])
     if sys.platform.startswith("win"):
         pip_install.install_optional_dependencies(['pyreadline3'])
 

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.2}/micrOS/micropython/board_commands.json

@@ -1,55 +1,55 @@
 {"esp32":
-     {"erase": "{esptool_interface} --port {dev} erase_flash",
+     {"erase": "{esptool_interface} --port {dev} erase-flash",
       "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}",
       "ampy_cmd": "ampy -p {dev} -b 115200 -d 2 {args}",
       "mpremote_cmd": null,
       "cmd_line_info": "[!HINT!] PRESS [EN] BUTTON TO ENABLE DEVICE ERASE...",
       "url": "https://micropython.org/download/ESP32_GENERIC/"},
  "esp32cam":
-      {"erase": "{esptool_interface} --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "*** [!DISCLAIMER!] ***\n\tUSB copy not works with some serial interface\n\tCopy manually: toolkit/workspace/precompiled/micrOSloader.mpy\n\tNetwork.mpy Debug.mpy ConfigHandler.mpy main.py\n\tThen push OTA update over AP mode... Then you are done",
        "url": "https://github.com/lemariva/micropython-camera-driver/tree/master/firmware"},
  "esp32s2":
-      {"erase": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase_flash",
+      {"erase": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset erase-flash",
        "deploy": "{esptool_interface} --chip esp32s2 --port {dev} --after no_reset --baud 460800 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Hold on Button 0 -> Press Button Reset -> Release Button 0 TO ENABLE DEVICE ERASE...",
        "url": "https://micropython.org/download/ESP32_GENERIC_S2/"},
  "tinypico":
-      {"erase": "{esptool_interface} --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}",
        "mpremote_cmd": null,
        "ampy_cmd": "ampy -p {dev} -b 115200 -d 2 {args}",
        "cmd_line_info": "",
        "url": "https://micropython.org/download/UM_TINYPICO/"},
  "esp32s3_spiram_oct":
-      {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase_flash",
+      {"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": "[!HINNT!] Press boot button under connecting the board over USB: enables flash erase",
        "url": "https://micropython.org/download/ESP32_GENERIC_S3/"},
  "esp32s3":
-     {"erase": "{esptool_interface} --chip esp32s3 --port {dev} erase_flash",
+     {"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": "[!HINNT!] Press boot button under connecting board over USB: enables flash erase",
       "url": "https://micropython.org/download/ESP32_GENERIC_S3/"},
  "esp32c3":
-      {"erase": "{esptool_interface} --chip esp32c3 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c3 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",
        "url": "https://micropython.org/download/ESP32_GENERIC_C3/"},
  "esp32c6":
-      {"erase": "{esptool_interface} --chip esp32c6 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c6 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c6 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",
        "url": "https://micropython.org/download/ESP32_GENERIC_C6/"},
   "esp32c5":
-      {"erase": "{esptool_interface} --chip esp32c5 --port {dev} erase_flash",
+      {"erase": "{esptool_interface} --chip esp32c5 --port {dev} erase-flash",
        "deploy": "{esptool_interface} --chip esp32c5 --port {dev} --baud 460800 write_flash 0x2000 {micropython}",
        "mpremote_cmd": "mpremote",
        "cmd_line_info": "[!HINT!] Fully automatic deployment...",

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.2}/micrOS/source/Server.py

@@ -267,7 +267,7 @@ class ShellCli(Client, Shell):
             try:
                 # Read request msg from client
                 state, request = await self.read()
-                if state or request in ('exit', ''):
+                if state or request.strip() in ('exit', ''):
                     break
                 # Run micrOS shell with request string
                 Client.console("[ShellCli] --- #Run shell")
@@ -333,7 +333,7 @@ class Server:
             self._timeout = 5 if soc_timeout < 5 else soc_timeout
             # ---         ----
             self._initialized = True
-            Client.console("[ socket server ] <<constructor>>")
+            Client.console("[ socket server ] <<init>>")
 
     #####################################
     #       Socket Server Methods       #

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.2/micrOSDevToolKit.egg-info}/PKG-INFO

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

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.2}/setup.py

@@ -17,7 +17,7 @@ dependencies = ['adafruit-ampy', 'mpremote', 'esptool', 'ipaddress', 'netaddr',
 
 setuptools.setup(
     name='micrOSDevToolKit',
-    version='3.0.1',
+    version='3.0.2',
     author='Marcell Ban',
     author_email='miros.framework@gmail.com',
     description='Development and deployment environment for micrOS, the diy micropython automation OS (IoT)',

{microsdevtoolkit-3.0.1 → microsdevtoolkit-3.0.2}/toolkit/lib/pip_package_installer.py

@@ -1,8 +1,6 @@
 import sys
 import os
 import subprocess
-import getpass
-USER = getpass.getuser()
 MYPATH = os.path.dirname(__file__)
 USER_DATA_OPT_INST_DONE = os.path.join(MYPATH, '../user_data/.opt_dep_install')
 INTERPRETER = sys.executable
@@ -59,9 +57,9 @@ def install_package(name, additional_pip_param=None):
     print(f"Install optional dependency (pip): {name}")
     try:
         if additional_pip_param is None:
-            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', USER, name])
+            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', name])
         else:
-            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', USER, name, additional_pip_param])
+            state, out = run_subprocess([INTERPRETER, '-m', 'pip', 'install', '--user', name, additional_pip_param])
         if state:
             print(f"{TerminalColors.Colors.OK}[PIP] install {name} OK{TerminalColors.Colors.NC}")
         else:
@@ -110,4 +108,4 @@ def install_optional_dependencies(requirements):
 
 if __name__ == "__main__":
     print(list_packages())
-    install_optional_dependencies(['PyQt5'])
+    install_optional_dependencies(['PyQt5'])