micrOSDevToolKit 2.9.8__tar.gz → 2.9.10__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: micrOSDevToolKit
-Version: 2.9.8
+Version: 2.9.10
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -25,6 +25,15 @@ Requires-Dist: json2html
 Requires-Dist: requests
 Requires-Dist: Flask-BasicAuth
 Requires-Dist: soundfile
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 # ![LOGO](./media/logo_mini.png?raw=true) micrOS
 
@@ -78,6 +87,7 @@ Access rest api over browser: `http://<nodename>.local`
 2. micrOS Installer [link](https://github.com/BxNxM/micrOS/#installing-micros-with-devtoolkit-esp32-and-more)
 3. micrOS Tutorials [link](https://github.com/BxNxM/micrOS/#micros-video-tutorials)
 4. micrOS System and features [link](https://github.com/BxNxM/micrOS/#micros-framework-features)
+5. Built-in app modules: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
 5. Pin mapping - GPIO [link](https://github.com/BxNxM/micrOS/#device-pinouts-for-wiring)
 6. micrOS Node configuration [link](https://github.com/BxNxM/micrOS/#micros-node-configuration-parameters-with-description)
 7. micrOS create custom Load Modules: [link](./APPLICATION_GUIDE.md)
@@ -370,7 +380,7 @@ LogicalPin lookup tables:
 - [raspberryPicoW](./micrOS/source/IO_rp2.py) - reset needed after ota update (webrepl limitation)
 - `IO_*.py` [etc.](./micrOS/source)
 
-> Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte steams -> `.mpy`
+> Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte streams -> `.mpy`
 
 ![MicrOStinyPicopinout](./media/NodeMCUPinOutTinyPico.png?raw=true)
 

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/README.md

@@ -50,6 +50,7 @@ Access rest api over browser: `http://<nodename>.local`
 2. micrOS Installer [link](https://github.com/BxNxM/micrOS/#installing-micros-with-devtoolkit-esp32-and-more)
 3. micrOS Tutorials [link](https://github.com/BxNxM/micrOS/#micros-video-tutorials)
 4. micrOS System and features [link](https://github.com/BxNxM/micrOS/#micros-framework-features)
+5. Built-in app modules: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
 5. Pin mapping - GPIO [link](https://github.com/BxNxM/micrOS/#device-pinouts-for-wiring)
 6. micrOS Node configuration [link](https://github.com/BxNxM/micrOS/#micros-node-configuration-parameters-with-description)
 7. micrOS create custom Load Modules: [link](./APPLICATION_GUIDE.md)
@@ -342,7 +343,7 @@ LogicalPin lookup tables:
 - [raspberryPicoW](./micrOS/source/IO_rp2.py) - reset needed after ota update (webrepl limitation)
 - `IO_*.py` [etc.](./micrOS/source)
 
-> Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte steams -> `.mpy`
+> Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte streams -> `.mpy`
 
 ![MicrOStinyPicopinout](./media/NodeMCUPinOutTinyPico.png?raw=true)
 

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/devToolKit.py

@@ -35,6 +35,11 @@ try:
 except Exception as e:
     print(f"Optional dependency missing in macroScript: {e}")
     macroScript = None
+try:
+    from toolkit.WebRepl import open_webrepl
+except Exception as e:
+    print(f"Optional dependency missing in WebRepl: {e}")
+    open_webrepl = None
 
 
 def arg_parse():
@@ -70,6 +75,7 @@ def arg_parse():
     dev_group.add_argument("-gw", "--gateway", action="store_true", help="Start micrOS Gateway rest-api server, Env. vars: API_AUTH='username:password' (optional), GATEWAYIP needed for container deployment only.")
     dev_group.add_argument("-v", "--version", action="store_true", help="Get micrOS version - repo + connected device.")
     dev_group.add_argument("-lint", "--linter", action="store_true", help="Run micrOS system linter (pylint+)")
+    dev_group.add_argument("-webrepl", "--open_webrepl", action="store_true", help="(beta) Open webrepl in default browser, micropython repl + file transfers (built-in)")
     dev_group.add_argument("--light", action="store_true", help="Skip optional dependency deployments (low level param: add this as first argument always)")
 
     toolkit_group = parser.add_argument_group("Toolkit development")
@@ -293,6 +299,10 @@ if __name__ == "__main__":
         if micrOSlint is not None:
             sys.exit(micrOSlint.main(verbose=False))
 
+    if cmd_args.open_webrepl:
+        if open_webrepl is not None:
+            open_webrepl()
+
     if cmd_args.macro:
         if macroScript is None:
             print("macroScript not available :(")

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

@@ -1,11 +1,11 @@
 {
     "files": {
         "Time.py": [
-            9.17,
+            9.16,
             7
         ],
         "micrOSloader.py": [
-            8.0,
+            7.33,
             1
         ],
         "Hooks.py": [
@@ -33,11 +33,11 @@
             0
         ],
         "Shell.py": [
-            9.33,
+            9.11,
             1
         ],
         "Notify.py": [
-            8.38,
+            8.46,
             3
         ],
         "Types.py": [
@@ -89,7 +89,7 @@
             0
         ],
         "urequests.py": [
-            9.02,
+            8.99,
             5
         ],
         "LM_roboarm.py": [
@@ -109,7 +109,7 @@
             0
         ],
         "LM_oled_ui.py": [
-            9.07,
+            9.02,
             0
         ],
         "LM_system.py": [
@@ -129,7 +129,7 @@
             0
         ],
         "LM_oled.py": [
-            9.23,
+            9.09,
             4
         ],
         "LM_tinyrgb.py": [
@@ -165,7 +165,7 @@
             0
         ],
         "LM_oled_sh1106.py": [
-            8.84,
+            8.54,
             2
         ],
         "LM_haptic.py": [
@@ -177,7 +177,7 @@
             0
         ],
         "LM_neopixel.py": [
-            7.54,
+            7.43,
             2
         ],
         "LM_cct.py": [
@@ -229,11 +229,11 @@
             0
         ],
         "LM_sound_event.py": [
-            8.49,
+            8.46,
             0
         ],
         "LM_oledui.py": [
-            8.52,
+            8.16,
             0
         ],
         "LM_espnow.py": [
@@ -245,11 +245,11 @@
             0
         ],
         "LM_OV2640.py": [
-            9.19,
+            9.11,
             0
         ],
         "LM_rgb.py": [
-            8.82,
+            8.75,
             1
         ],
         "LM_distance.py": [
@@ -273,7 +273,7 @@
             4
         ],
         "LM_trackball.py": [
-            8.43,
+            8.31,
             1
         ],
         "LM_dashboard_be.py": [
@@ -305,7 +305,7 @@
             2
         ],
         "LM_i2s_mic.py": [
-            8.37,
+            8.3,
             2
         ],
         "LM_sdcard.py": [
@@ -315,7 +315,7 @@
     },
     "summary": {
         "core": [
-            3358,
+            3367,
             23
         ],
         "load": [
@@ -328,10 +328,10 @@
         ],
         "load_dep": [
             true,
-            6
+            5
         ],
-        "core_score": 9.13,
-        "load_score": 8.23,
-        "version": "2.9.8-0"
+        "core_score": 9.09,
+        "load_score": 8.21,
+        "version": "2.9.9-0"
     }
 }

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/LM_oled_ui.py

@@ -159,7 +159,7 @@ class PageUI:
             if pin:
                 pin_obj = Pin(pin, Pin.IN, Pin.PULL_DOWN)
                 # [IRQ] - event type setup
-                pin_obj.irq(trigger=Pin.IRQ_RISING, handler=callback)
+                pin_obj.irq(trigger=Pin.IRQ_FALLING, handler=callback)
 
         _set("js_right", lambda pin: self.control('next'))
         _set("js_left", lambda pin: self.control('prev'))

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/LM_system.py

@@ -124,18 +124,18 @@ def sun(refresh=False):
     return Sun.TIME
 
 
-def setclock(year, month, mday, hour, min, sec):
+def setclock(year, month, mday, hour, minute, sec):
     """
     Set Localtime + RTC Clock manually
     :param year
     :param month
     :param mday
     :param hour
-    :param min
+    :param minute
     :param sec
     :return: localtime
     """
-    set_time(year, month, mday, hour, min, sec)
+    set_time(year, month, mday, hour, minute, sec)
     return localtime()
 
 
@@ -242,7 +242,7 @@ def help(widgets=False):
         (widgets=True) list of widget json for UI generation
     """
     return resolve(('info', 'TEXTBOX top', 'gclean', 'heartbeat', 'clock',
-                    'setclock year month mday hour min sec',
+                    'setclock year month mday hour minute sec',
                     'ntp', 'rssi', 'list_stations', 'pinmap key="dhtpin"/None', 'alarms clean=False',
                     'notifications enable=<None,True,False>',
                     'sun refresh=False', 'ifconfig', 'memory_usage',

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/Notify.py

@@ -32,6 +32,10 @@ class Notify:
             return True
         raise Exception("Subscribe error, Notify parent missing")
 
+    @staticmethod
+    def send_msg(text, reply_to=None, chat_id=None):
+        raise NotImplementedError("Child class must implement send_msg method")
+
     @staticmethod
     def message(text, reply_to=None, chat_id=None):
         """

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/Server.py

@@ -114,7 +114,7 @@ class Client:
             console_write("[Client] NoCon: response>dev/nul")
 
     def send(self, response):
-        # Implement in child class - synchronous send (all) method
+        # Optional - Implement in child class - synchronous send (all) method
         pass
 
     async def close(self):

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import errlog_add
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.9.8-0'
+    MICROS_VERSION = '2.9.9-0'
 
     def __init__(self):
         """
@@ -46,8 +46,8 @@ class Shell:
             errlog_add(f"[ERR] micrOS version export failed (config): {e}")
 
     async def a_send(self, msg):
-        """ Must be defined by parent class... """
-        pass
+        """ Must be defined by child class... """
+        raise NotImplementedError("Child class must implement a_send method")
 
     def reset(self):
         """Reset shell state"""

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/Tasks.py

@@ -415,7 +415,7 @@ class Manager:
 #################################################################
 def exec_builtins(func):
     """
-    Module execution built-in commands and modifiers
+    [Decorator] Module execution built-in commands and modifiers
     - modules         - show active modules list
     - task kill ...   - task termination
            show ...   - task output dump

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/Time.py

@@ -24,17 +24,17 @@ class Sun:
     BOOTIME = None       # Initialize BOOTIME: Not SUN, but for system uptime
 
 
-def set_time(year, month, mday, hour, min, sec):
+def set_time(year, month, mday, hour, minute, sec):
     """
     Set Localtime + RTC Clock manually + update BOOTIME/uptime
         https://docs.micropython.org/en/latest/library/machine.RTC.html
     """
     # Make time from tuple to sec
-    time_sec = mktime((year, month, mday, hour, min, sec, 0, 0))
+    time_sec = mktime((year, month, mday, hour, minute, sec, 0, 0))
     # Set localtime
     localtime(time_sec)
     # Set RTC
-    RTC().datetime((year, month, mday, 0, hour, min, sec, 0))
+    RTC().datetime((year, month, mday, 0, hour, minute, sec, 0))
     # (re)set uptime when settime - normally at boot time
     if Sun.BOOTIME is None:
         Sun.BOOTIME = time()
@@ -95,19 +95,18 @@ def __sun_cache(mode):
     """
     if mode == 's':
         # SAVE CACHE
-        temp = {}
         try:
             with open('sun.pds', 'w') as f:
-                for k, v in Sun.TIME.items():
-                    temp[k] = tuple([str(t) for t in v])
-                f.write(';'.join([f'{k}:{"-".join(v)}' for k, v in temp.items()]))
+                cache = {k:tuple([str(t) for t in v]) for k, v in Sun.TIME.items()}
+                f.write(';'.join([f'{k}:{"-".join(v)}' for k, v in cache.items()]))
         except:
             errlog_add("[ERR] Cannot write sun cache")
         return
     try:
         # RESTORE CACHE
         with open('sun.pds', 'r') as f:
-            buff = {data.split(':')[0]: data.split(':')[1].split('-') for data in f.read().strip().split(';')}
+            buff = {data.split(':')[0]: data.split(':')[1].split('-')
+                    for data in f.read().strip().split(';')}
             for k, v in buff.items():
                 Sun.TIME[k] = tuple([int(e) for e in v])
     except:

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOS/source/micrOSloader.py

@@ -79,7 +79,6 @@ def __recovery_mode():
         reset()
 
 
-
 def __auto_restart_event():
     """
     Poll .if_mode value main loop in case of webrepl (background) mode:

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

@@ -116,7 +116,7 @@ def _parse_response(response):
 #          micropython HTTP request         #
 #############################################
 
-def request(method, url, data=None, json=None, headers=None, sock_size=256, jsonify=False):
+def request(method:str, url:str, data:str=None, json=None, headers:dict=None, sock_size=256, jsonify=False):
     """
     Micropython syncronous HTTP request function for REST API handling
     :param method: GET/POST
@@ -181,7 +181,7 @@ def request(method, url, data=None, json=None, headers=None, sock_size=256, json
 #       async micropython HTTP request      #
 #############################################
 
-async def arequest(method, url, data=None, json=None, headers=None, sock_size=256, jsonify=False):
+async def arequest(method:str, url:str, data:str=None, json=None, headers:dict=None, sock_size=256, jsonify=False):
     """
     Micropython asynchronous HTTP request function for REST API handling
     :param method: GET/POST
@@ -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:
@@ -234,14 +239,16 @@ async def arequest(method, url, data=None, json=None, headers=None, sock_size=25
 #      Implement http get/post functions    #
 #############################################
 
-def get(url, headers={}, sock_size=256, jsonify=False):
+def get(url:str, headers:dict=None, sock_size=256, jsonify=False):
     """
     GENERIC HTTP GET FUNCTION
     """
+    if headers is None:
+        headers = {}
     return request('GET', url, headers=headers, sock_size=sock_size, jsonify=jsonify)
 
 
-def post(url, data=None, json=None, headers={}, sock_size=256, jsonify=False):
+def post(url:str, data=None, json=None, headers:dict=None, sock_size=256, jsonify=False):
     """
     GENERIC HTTP POST FUNCTION
     :param data: string body (handle bare string as data for POST method)
@@ -250,14 +257,14 @@ def post(url, data=None, json=None, headers={}, sock_size=256, jsonify=False):
     return request('POST', url, data=data, json=json, headers=headers, sock_size=sock_size, jsonify=jsonify)
 
 
-async def aget(url, headers={}, sock_size=256, jsonify=False):
+async def aget(url:str, headers:dict=None, sock_size=256, jsonify=False):
     """
     GENERIC ASYNC HTTP GET FUNCTION
     """
     return await arequest('GET', url, headers=headers, sock_size=sock_size, jsonify=jsonify)
 
 
-async def apost(url, data=None, json=None, headers={}, sock_size=256, jsonify=False):
+async def apost(url, data=None, json=None, headers:dict=None, sock_size=256, jsonify=False):
     """
     GENERIC ASYNC HTTP POST FUNCTION
     :param data: string body (handle bare string as data for POST method)

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: micrOSDevToolKit
-Version: 2.9.8
+Version: 2.9.10
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -25,6 +25,15 @@ Requires-Dist: json2html
 Requires-Dist: requests
 Requires-Dist: Flask-BasicAuth
 Requires-Dist: soundfile
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 # ![LOGO](./media/logo_mini.png?raw=true) micrOS
 
@@ -78,6 +87,7 @@ Access rest api over browser: `http://<nodename>.local`
 2. micrOS Installer [link](https://github.com/BxNxM/micrOS/#installing-micros-with-devtoolkit-esp32-and-more)
 3. micrOS Tutorials [link](https://github.com/BxNxM/micrOS/#micros-video-tutorials)
 4. micrOS System and features [link](https://github.com/BxNxM/micrOS/#micros-framework-features)
+5. Built-in app modules: [link](https://htmlpreview.github.io/?https://github.com/BxNxM/micrOS/blob/master/micrOS/client/sfuncman/sfuncman.html)
 5. Pin mapping - GPIO [link](https://github.com/BxNxM/micrOS/#device-pinouts-for-wiring)
 6. micrOS Node configuration [link](https://github.com/BxNxM/micrOS/#micros-node-configuration-parameters-with-description)
 7. micrOS create custom Load Modules: [link](./APPLICATION_GUIDE.md)
@@ -370,7 +380,7 @@ LogicalPin lookup tables:
 - [raspberryPicoW](./micrOS/source/IO_rp2.py) - reset needed after ota update (webrepl limitation)
 - `IO_*.py` [etc.](./micrOS/source)
 
-> Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte steams -> `.mpy`
+> Note: Good idea to use costant variable for pin map declaration, check the files for more info, These files are also precompiled automatically into byte streams -> `.mpy`
 
 ![MicrOStinyPicopinout](./media/NodeMCUPinOutTinyPico.png?raw=true)
 

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/micrOSDevToolKit.egg-info/SOURCES.txt

@@ -132,6 +132,9 @@ micrOS/source/urequests.py
 micrOS/source/ustyle.css
 micrOS/source/uwidgets.js
 micrOS/source/uwidgets_pro.js
+micrOS/source/__pycache__/Common.cpython-312.pyc
+micrOS/source/__pycache__/Logger.cpython-312.pyc
+micrOS/source/__pycache__/Server.cpython-312.pyc
 micrOSDevToolKit.egg-info/PKG-INFO
 micrOSDevToolKit.egg-info/SOURCES.txt
 micrOSDevToolKit.egg-info/dependency_links.txt
@@ -143,14 +146,13 @@ toolkit/DevEnvUSB.py
 toolkit/Gateway.py
 toolkit/LM_to_compile.dat
 toolkit/MicrOSDevEnv.py
+toolkit/WebRepl.py
 toolkit/__init__.py
 toolkit/img_stream.html
 toolkit/index.html
 toolkit/micrOSdashboard.py
 toolkit/micrOSlint.py
 toolkit/socketClient.py
-toolkit/dashboard_apps/AirQualityBME280.py
-toolkit/dashboard_apps/AirQualityDHT22_CO2.py
 toolkit/dashboard_apps/BackupRestore.py
 toolkit/dashboard_apps/CCTDemo.py
 toolkit/dashboard_apps/CCTTest.py
@@ -165,9 +167,11 @@ toolkit/dashboard_apps/PresenceTest.py
 toolkit/dashboard_apps/RGBTest.py
 toolkit/dashboard_apps/RoboArm.py
 toolkit/dashboard_apps/SED_test.py
+toolkit/dashboard_apps/SensorsTest.py
 toolkit/dashboard_apps/SystemTest.py
 toolkit/dashboard_apps/Template_app.py
 toolkit/dashboard_apps/__init__.py
+toolkit/dashboard_apps/_app_base.py
 toolkit/dashboard_apps/_capture.py
 toolkit/dashboard_apps/_micPlotting.py
 toolkit/dashboard_apps/_presencePlotting.py

{microsdevtoolkit-2.9.8 → microsdevtoolkit-2.9.10}/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.10',
     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.10}/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.10}/toolkit/MicrOSDevEnv.py

@@ -214,12 +214,22 @@ class MicrOSDevTool(OTA, USB):
         _url = hardcoded_manual["task"]["img"]
         hardcoded_manual['task']['img'] = f'<img src="{_url}" alt="tasks" height=150>'
         module_function_dict_html.update(hardcoded_manual)
-        module_function_json = json.dumps(module_function_dict_html, indent=4)
         import json2html
         table_attributes = 'border="1" cellspacing="1" cellpadding="5" width="80%"'
-        html_table = json2html.json2html.convert(json=module_function_json,
-                                                 table_attributes=table_attributes,
-                                                 clubbing=True, escape=False, encode=False)
+
+        sorted_modules_w_data = dict(sorted(module_function_dict_html.items(), key=lambda item: item[0].lower()))
+        module_shortcuts = ' | '.join(
+            f'<a href="#{mod_name.replace(" ", "_")}">{mod_name}</a>'
+            for mod_name in sorted_modules_w_data)
+        html_tables = module_shortcuts + "<br><hr><br>"
+        for key, value in sorted_modules_w_data.items():
+            anchor = key.replace(" ", "_")  # Replace spaces with underscores for a valid anchor
+            html_tables += f'\n<br><br>\n<h2 id="{anchor}"><a href="#{anchor}">{key}</a></h2>\n'
+            html_tables += json2html.json2html.convert(json=value,
+                                             table_attributes=table_attributes,
+                                             clubbing=True,
+                                             escape=False,
+                                             encode=False)
 
         # http://corelangs.com/css/table/tablecolor.html
         # http://corelangs.com/css/table/tablecolor.html
@@ -267,11 +277,15 @@ Logical pin names aka pin map
   <li><a href="https://github.com/BxNxM/micrOS/blob/master/micrOS/source/IO_rp2.py" target="_blank">rp2 (experimental)</a></li>
 </ul>
 
+<h2>
+Built-in control modules for various peripheries.:
+</h2>
+
 """
         html_body_end = """</body>
 </html>"""
 
-        html_page = html_body_start + html_table + html_body_end
+        html_page = html_body_start + html_tables + html_body_end
         # Write html to file
         with open(static_help_html_path, 'w') as f:
             f.write(html_page)