micrOSDevToolKit 2.17.0__tar.gz → 2.17.1__tar.gz

{microsdevtoolkit-2.17.0/micrOSDevToolKit.egg-info → microsdevtoolkit-2.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.17.0
+Version: 2.17.1
 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.17.0 → microsdevtoolkit-2.17.1}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -9,7 +9,7 @@
             10
         ],
         "micrOSloader.py": [
-            7.12,
+            7.06,
             1
         ],
         "Hooks.py": [
@@ -213,7 +213,7 @@
             0
         ],
         "modules/LM_esp32.py": [
-            6.52,
+            6.79,
             0
         ],
         "modules/LM_veml7700.py": [
@@ -241,7 +241,7 @@
             0
         ],
         "modules/LM_cluster.py": [
-            8.87,
+            8.82,
             0
         ],
         "modules/LM_oledui.py": [
@@ -323,11 +323,11 @@
     },
     "summary": {
         "core": [
-            3923,
+            3925,
             24
         ],
         "load": [
-            9871,
+            9880,
             56
         ],
         "core_dep": [
@@ -339,7 +339,7 @@
             4
         ],
         "core_score": 9.24,
-        "load_score": 8.35,
-        "version": "2.17.0-0"
+        "load_score": 8.36,
+        "version": "2.17.1-0"
     }
 }

{microsdevtoolkit-2.17.0 → microsdevtoolkit-2.17.1}/micrOS/source/Shell.py

@@ -25,7 +25,7 @@ from Debug import syslog
 
 class Shell:
     __slots__ = ['__devfid', '__auth_mode', '__hwuid', '__auth_ok', '__conf_mode']
-    MICROS_VERSION = '2.17.0-0'
+    MICROS_VERSION = '2.17.1-0'
 
     def __init__(self):
         """

{microsdevtoolkit-2.17.0 → microsdevtoolkit-2.17.1}/micrOS/source/Web.py

@@ -41,7 +41,7 @@ class WebEngine:
                      "png": "image/png",
                      "gif": "image/gif"}
     METHODS = ("GET", "POST")
-    UI_RAM_REQ = 50            # in kilobytes
+    MEM_LIMITED = (None, 0)
 
     def __init__(self, client, version):
         self.client = client
@@ -62,11 +62,11 @@ class WebEngine:
     @staticmethod
     def is_mem_limited() -> (bool, int):
         """Check if memory is limited for the FE"""
-        collect()
-        mfree = int(mem_free() * 0.001)
-        if mfree < WebEngine.UI_RAM_REQ:
-            return True, mfree
-        return False, mfree
+        if WebEngine.MEM_LIMITED[0] is None:
+            collect()
+            mfree = int(mem_free() * 0.001)
+            WebEngine.MEM_LIMITED = (mfree < 50, mfree)        # 50 kb memory requirement
+        return WebEngine.MEM_LIMITED
 
     async def response(self, request:str) -> bool:
         """HTTP GET/POST REQUEST - WEB INTERFACE"""

{microsdevtoolkit-2.17.0 → microsdevtoolkit-2.17.1}/micrOS/source/micrOSloader.py

@@ -55,6 +55,8 @@ def _is_micrOS():
 
 def __recovery_mode():
     # Recovery/Update mode (webrepl) - dependencies: Network, ConfigHandler
+    from sys import path
+    path.insert(0, "/modules")
     from Network import auto_nw_config
     from Config import cfgget
     pwd = cfgget('appwd')                       # Get pwd from config

{microsdevtoolkit-2.17.0 → microsdevtoolkit-2.17.1}/micrOS/source/modules/LM_cluster.py

@@ -36,7 +36,7 @@ async def _reboot(tag:str):
     (Enable function return before restart...)
     """
     with micro_task(tag) as my_task:
-        await my_task.feed(3000)
+        await my_task.feed(5000)
         soft_reset()
 
 
@@ -93,30 +93,32 @@ async def _align_channel(tag:str, sta:STA_IF, ap:AP_IF):
     with micro_task(tag) as my_task:
         while True:
             my_task.out = "Sync in progress..."
-            _channel = Cluster.CHANNEL
+            ch = Cluster.CHANNEL
             _refresh_ms = Cluster.REFRESH_MS
             for s, b, c, *_ in sta.scan():
                 sta_name = (s.decode() if isinstance(s, bytes) else s)
                 if sta_name.endswith(Cluster.ANCHOR_SSID_POSTFIX):
                     my_task.out = f"Anchor {sta_name} channel: {c} (refresh: {int(_refresh_ms/60_000)}min)"
-                    _channel = c
+                    ch = c
+                    break
 
-            if not _initialized or _channel != Cluster.CHANNEL:
-                Cluster.CHANNEL = _channel
+            if not _initialized or ch != Cluster.CHANNEL:
+                Cluster.CHANNEL = ch
                 if not sta.isconnected():
                     # ENABLE ESPNOW STA MAC ACCESS - AFTER THIS ALL DEVICES CAN REACH EACH OTHER ON STA MAC ADDRESS
-                    try: sta.config(channel=_channel)
+                    try: sta.config(channel=ch)
                     except Exception as e:
-                        my_task.out = f"STA Failed to set {_channel} channel: {e}"
+                        my_task.out = f"STA Failed to set {ch} channel: {e}"
                 # ensure AP advertises/operates on the same channel (important when STA not connected yet)
-                try: ap.config(channel=_channel)
+                try: ap.config(channel=ch)
                 except Exception as e:
-                    my_task.out = f"AP Failed to set {_channel} channel: {e}"
+                    my_task.out = f"AP Failed to set {ch} channel: {e}"
                 _initialized = True
             await my_task.feed(_refresh_ms)
 
 
-def __configure_cluster_network(anchor=False):
+@micro_task("cluster", _wrap=True)
+async def _network(tag:str, anchor=False):
     """
     Support hybrid AP/STA ESPNow communication
     For ESPNow communication all device should use the same Wifi channel!
@@ -140,23 +142,25 @@ def __configure_cluster_network(anchor=False):
         if not sta.active(): sta.active(True)
         return sta
 
-    # CONFIGURE WIFI CHANNEL SYNC ROLES
-    micros_nw = ifconfig()[0]
-    # MICROS in STA MODE
-    if micros_nw == "STA":
-        if anchor:
-            # CREATE CHANNEL ANCHOR - AP channel is inherited from STA
-            Cluster.ANCHOR_ENABLED = _conf_ap_anchor()
-    else:
-        # MICROS in AP MODE: CLUSTER FOLLOWER - WIFI CHANNEL SYNC WITH ANCHOR
-        ap, sta = WLAN(AP_IF), _enable_sta()
-        _align_channel(sta, ap)
-        if anchor:
-            # MICROS in AP MODE - RECONFIGURE AP NAME to match Anchor
-            # EXPERIMENTAL FEATURE: Scans and Advertise the channel as well.
-            Cluster.ANCHOR_ENABLED = _conf_ap_anchor()
-    return status()
-
+    with micro_task(tag) as my_task:
+        # CONFIGURE WIFI CHANNEL SYNC ROLES
+        my_task.out = "Configure cluster network"
+        micros_nw = ifconfig()[0]
+        # MICROS in STA MODE
+        if micros_nw == "STA":
+            if anchor:
+                # CREATE CHANNEL ANCHOR - AP channel is inherited from STA
+                Cluster.ANCHOR_ENABLED = _conf_ap_anchor()
+        else:
+            # MICROS in AP MODE: CLUSTER FOLLOWER - WIFI CHANNEL SYNC WITH ANCHOR
+            ap, sta = WLAN(AP_IF), _enable_sta()
+            # Sync Channel with Cluster Anchor
+            _align_channel(sta, ap)
+            if anchor:
+                # MICROS in AP MODE - RECONFIGURE AP NAME to match Anchor
+                # EXPERIMENTAL FEATURE: Scans and Advertise the channel as well.
+                Cluster.ANCHOR_ENABLED = _conf_ap_anchor()
+        my_task.out = status()
 
 #########################################################
 #                 CLUSTER WIDE FEATURES                 #
@@ -232,8 +236,9 @@ def load(anchor:bool=False, refresh:int=None):
         return "ESPNow is disabled"
     if refresh is not None:
         Cluster.REFRESH_MS = 60_000 if refresh < 1 else refresh * 60_000
-    out = __configure_cluster_network(anchor)
-    return f"Enable cluster module access\n{out}"
+    # Configure cluster network - after micrOS network setup
+    _network(anchor)
+    return f"Enable cluster module access"
 
 
 def help(widgets=True):

{microsdevtoolkit-2.17.0 → microsdevtoolkit-2.17.1/micrOSDevToolKit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.17.0
+Version: 2.17.1
 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.17.0 → microsdevtoolkit-2.17.1}/setup.py

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