micrOSDevToolKit 2.8.3__tar.gz → 2.8.5__tar.gz

{microsdevtoolkit-2.8.3/micrOSDevToolKit.egg-info → microsdevtoolkit-2.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.8.3
+Version: 2.8.5
 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.8.3 → microsdevtoolkit-2.8.5/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.8.3
+Version: 2.8.5
 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.8.3 → microsdevtoolkit-2.8.5}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -361,6 +361,7 @@ toolkit/workspace/precompiled/main.py
 toolkit/workspace/precompiled/micrOS.mpy
 toolkit/workspace/precompiled/micrOSloader.mpy
 toolkit/workspace/precompiled/microIO.mpy
+toolkit/workspace/precompiled/node_config.json
 toolkit/workspace/precompiled/reset.mpy
 toolkit/workspace/precompiled/uapi.js
 toolkit/workspace/precompiled/udashboard.js

{microsdevtoolkit-2.8.3 → microsdevtoolkit-2.8.5}/setup.py

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

{microsdevtoolkit-2.8.3 → microsdevtoolkit-2.8.5}/toolkit/DevEnvUSB.py

@@ -3,6 +3,7 @@ import sys
 import json
 import time
 import pprint
+
 MYPATH = os.path.dirname(__file__)
 print("Module [DevEnvOTA] path: {} __package__: {} __name__: {} __file__: {}".format(
     sys.path[0], __package__, __name__, MYPATH))
@@ -31,31 +32,32 @@ class USB(Compile):
         self.micropython_bin_dir_path = os.path.join(MYPATH, "../micrOS/micropython")
         self.micrOS_node_config_archive = os.path.join(MYPATH, "user_data/node_config_archive")
         self.node_config_profiles_path = os.path.join(MYPATH, "../micrOS/release_info/node_config_profiles/")
+        self.esptool_interface = self.get_valid_esptool_cmd()
         self.dev_types_and_cmds = \
             {'esp32':
-                 {'erase': 'esptool.py --port {dev} erase_flash',
-                  'deploy': 'esptool.py --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
+                 {'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': None,
                   'cmd_line_info': '[!HINT!] PRESS [EN] BUTTON TO ENABLE DEVICE ERASE...'},
              'esp32cam':
-                  {'erase': 'esptool.py --port {dev} erase_flash',
-                   'deploy': 'esptool.py --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
+                  {'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'},
              'esp32s2':
-                 {'erase': 'esptool.py --chip esp32s2 --port {dev} --after no_reset erase_flash',
-                  'deploy': 'esptool.py --chip esp32s2 --port {dev} --after no_reset --baud 460800 write_flash -z 0x1000 {micropython}',
+                 {'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...'},
              'tinypico':
-                 {'erase': 'esptool.py --port {dev} erase_flash',
-                  'deploy': 'esptool.py --chip esp32 --port {dev} --baud 460800 write_flash -z 0x1000 {micropython}',
+                 {'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': ''},
              'tinypico_usbc':
-                 {'erase': 'esptool.py --port {dev} erase_flash',
-                  'deploy': 'esptool.py --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}',
+                 {'erase': '{esptool_interface} --port {dev} erase_flash',
+                  'deploy': '{esptool_interface} --chip esp32 --port {dev} --baud 921600 write_flash -z 0x1000 {micropython}',
                   'ampy_cmd': 'ampy -p {dev} -b 115200 -d 2 {args}',
                   'mpremote_cmd': None,
                   'cmd_line_info': ''},
@@ -65,18 +67,18 @@ class USB(Compile):
                   'mpremote_cmd': 'mpremote',
                   'cmd_line_info': '[!!!] Experimental device - no stable micropython yet'},
              'esp32s3_spiram_oct':
-                 {'erase': 'esptool.py --chip esp32s3 --port {dev} erase_flash',
-                  'deploy': 'esptool.py --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
+                 {'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.'},
              'esp32s3':
-                 {'erase': 'esptool.py --chip esp32s3 --port {dev} erase_flash',
-                  'deploy': 'esptool.py --chip esp32s3 --port {dev} write_flash -z 0 {micropython}',
+                 {'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.'},
              'esp32c3':
-                 {'erase': 'esptool.py --chip esp32c3 --port {dev} erase_flash',
-                  'deploy': 'esptool.py --chip esp32c3 --port {dev} --baud 460800 write_flash -z 0x0 {micropython}',
+                 {'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...'},
              }
@@ -85,6 +87,22 @@ class USB(Compile):
             install_usb_serial_driver()
             USB.usb_driver_ok = True
 
+    @staticmethod
+    def get_valid_esptool_cmd():
+        # Windows / Linux / MacOS installation dependencies
+        command_possibilities = ("esptool.py", "esptool")
+        for cmd in command_possibilities:
+            validate_cmd = f"{cmd} -h"
+            exitcode, stdout, stderr = LocalMachine.CommandHandler.run_command(validate_cmd, shell=True)
+            if exitcode == 0:
+                return cmd
+        print("!"*60)
+        print(f"{Colors.ERR}No esptool available... USB features are not available{Colors.NC}")
+        print("!"*60)
+        time.sleep(5)
+        return command_possibilities[0]     # Default
+
+
     #############################
     #       Main interfaces     #
     #############################
@@ -137,7 +155,7 @@ class USB(Compile):
 
         selected_device = self.get_devices()[0]
         print("selected_device_port: {}".format(selected_device))
-        command = erase_cmd.format(dev=selected_device)
+        command = erase_cmd.format(dev=selected_device, esptool_interface=self.esptool_interface)
         self.console("CMD: {}".format(command))
         if self.dry_run:
             exitcode = 0
@@ -171,7 +189,8 @@ class USB(Compile):
 
         selected_device = self.get_devices()[0]
         selected_micropython = self.selected_micropython_bin
-        command = deploy_cmd.format(dev=selected_device, micropython=selected_micropython)
+        command = deploy_cmd.format(dev=selected_device, micropython=selected_micropython,
+                                    esptool_interface=self.esptool_interface)
         self.console("CMD: {}".format(command))
         if self.dry_run:
             exitcode = 0

microsdevtoolkit-2.8.5/toolkit/workspace/precompiled/node_config.json

@@ -0,0 +1 @@
+{"irq2": false, "irq2_cbf": "n/a", "irq3_cbf": "n/a", "timirq": false, "irq4": false, "auth": false, "irq4_cbf": "n/a", "devip": "192.168.3.239", "soctout": 100, "appwd": "ADmin123", "timirqcbf": "n/a", "timirqseq": 1000, "hwuid": "micr7c9ebd6147c4OS", "staessid": "Researchers", "irq1_cbf": "n/a", "cron": false, "irq4_trig": "n/a", "nwmd": "STA", "boothook": "bme280 load; dimmer load; distance load;veml7700 load;#rencoder load", "version": "2.7.0-0", "irq_prell_ms": 300, "crontasks": "n/a", "aioqueue": 5, "utc": 60, "boostmd": true, "irq1_trig": "n/a", "guimeta": "...", "socport": 9008, "webui": false, "cstmpmap": "buzzer:23", "telegram": "5878434165:AAFqTfjh60XKlyW6Bi41yIoYkxzlrID2OWU", "irq3_trig": "n/a", "dbg": true, "irq2_trig": "n/a", "irq3": false, "devfid": "TestBird", "stapwd": "rWVc8F76Kubp", "irq1": false}