micrOSDevToolKit 2.17.0__py3-none-any.whl → 2.17.1__py3-none-any.whl

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"
     }
 }

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):
         """

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"""

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

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.dist-info → microsdevtoolkit-2.17.1.dist-info}/METADATA

@@ -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.dist-info → microsdevtoolkit-2.17.1.dist-info}/RECORD

@@ -33,7 +33,7 @@ micrOS/micropython/esp32s3_spiram_oct-20231005-v1.21.0.bin,sha256=S-sv_QeL_Tylg1
 micrOS/micropython/esp32s3_spiram_oct-20241129-v1.24.1.bin,sha256=VbOF_F0YeqttkQd2ePTW66Jd34RU8u9ccFfcv8kxO_U,1662672
 micrOS/micropython/rpi-pico-w-20241129-v1.24.1.uf2,sha256=v4aYIbWaE94_f6DDzBWS-a9L1BzlcdkZwld9R7bOVA4,1727488
 micrOS/micropython/tinypico-20241129-v1.24.1.bin,sha256=Kf3cr766a5SK99CZy8bwdWjwvAZxls3tBYvaHBsw7ac,1527200
-micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json,sha256=vWGw8wCL8KD0Uz8EqpXtLGndDB5ClF2c9ULZf_9Cmuk,6338
+micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json,sha256=C7NUIDrkLDo7FXoG7zQQyZAyIyn6f0eUqPDEWJW1qnU,6338
 micrOS/source/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 micrOS/source/Common.py,sha256=uvfLeei3Koi3MWraIk1LU4ArO7C5krcHm9mSN3tOTDM,16793
 micrOS/source/Config.py,sha256=094MYe1UUbRy5qRiC-HBR9GvVOXY7-2fqF9UvEtfIGo,9187
@@ -48,14 +48,14 @@ micrOS/source/Network.py,sha256=bFG_OE1baHQFJgpcNC_KAKTGPQlgN7pisV07CI30k1g,1016
 micrOS/source/Notify.py,sha256=5_Sqy2FeBVG6HznC48Rgg812AglGjO8pkDYGSpp5qSg,2637
 micrOS/source/Scheduler.py,sha256=EhOdDQqN4V1G0TD2jU5cmjUjY_g-sU8NwFoUfniBKF0,9628
 micrOS/source/Server.py,sha256=gNT3pcNsw8NVwldEe3c6uXlyMdawNS6F1bKUoy-OpLQ,16862
-micrOS/source/Shell.py,sha256=JDeb0JMA8s7QSlaue70kPAywGVS-OC6jkdhGDVXAYyQ,13309
+micrOS/source/Shell.py,sha256=bGsDJ2teXwxUGnFgL5-5BiqvvUlurRU4coINHNc1hxs,13309
 micrOS/source/Tasks.py,sha256=9ITabnBkiI9W6g_wechD0fdRZvynTFyaFzUk3qNnmM4,23996
 micrOS/source/Time.py,sha256=8EHp86CAkbGIErGgN-VGAsslUBFIooRGkHB1hUYwwOE,6408
 micrOS/source/Types.py,sha256=Ft_gHokGNa9aQRGSwE3NYIvYZuolT3zfkD5JzhycQ1s,3499
-micrOS/source/Web.py,sha256=2wWj8Tfjq8GiNqSQ4gmSfxtVTMIfOrDCIhQHY3IKH-c,10997
+micrOS/source/Web.py,sha256=EeZzKcZMTDVls5Qu-kT8dnX2Mt8L6M4eLiCBhDBJa40,11059
 micrOS/source/main.py,sha256=cVlhoWwU9dSKEol0HWPihFAPzrUUvzSGwZNNMrpyfSY,440
 micrOS/source/micrOS.py,sha256=QM1lgUnv2qrklj5-qgU6MM_6YsTKq4VGk71Od3Dzx1M,2872
-micrOS/source/micrOSloader.py,sha256=jefxV3yxmk8-UFeVADHZ9t_ezC2F_4bqMljRfv6tb4I,4571
+micrOS/source/micrOSloader.py,sha256=wFS1i90q5po-fKpnEpwL_O4KQV9QujgwAR1QvXpjNvA,4627
 micrOS/source/microIO.py,sha256=h7i78Rl_DKG5vwpCgk1dsY-Z9ikvmOQLMiusYP_yRMI,7096
 micrOS/source/reset.py,sha256=i7wsPkOXE7Mm0xOiw1CjqCvCdNjBvYswn9CRDvE2VbE,248
 micrOS/source/urequests.py,sha256=SrzOgo8UF9YncjfeItM9-xqUr5xEoUt1kOcPxisn6uw,9456
@@ -83,7 +83,7 @@ micrOS/source/modules/LM_aht10.py,sha256=aC6-cvfG6OWoBinYD47mYGg7eIY8BfJxg6yMENr
 micrOS/source/modules/LM_bme280.py,sha256=4v7HtJ3HgbLwpRe-OwKR-D2nTM_PBDyFR8SHInig3Is,12708
 micrOS/source/modules/LM_buzzer.py,sha256=S8pwUZI8OidoATQPVmdvrSiJjPycDYp0gJiMxey7WCQ,12432
 micrOS/source/modules/LM_cct.py,sha256=D6lGBO4YAU44rt_ymm0rlkbqSH4agaacZXz7Om22Bmk,14207
-micrOS/source/modules/LM_cluster.py,sha256=39Aw_bWGb7yoLMBMQh1-uom-7SxWgRh_v-a0JgMGiAU,8695
+micrOS/source/modules/LM_cluster.py,sha256=iI-l6TJP4ejOY8tlE3OgjP82AL7dPNmn2fnaq4CRIdo,8937
 micrOS/source/modules/LM_co2.py,sha256=Eopq9eEPV9W2x5mx5EJGllg09_HFTYiI1hZE2T_PWTY,5460
 micrOS/source/modules/LM_dashboard_be.py,sha256=KVaJH37TCJkEwZJdGAVKpJtZXyVqYKDupyJO5BXvI0c,966
 micrOS/source/modules/LM_dht11.py,sha256=pmmtpxnYHApo63WvQXHlgx_z3A86dMSi1Stb9pSRpYY,2010
@@ -139,8 +139,8 @@ micrOS/source/web/udashboard.js,sha256=42mPR_NU3jOqUgLi7yZv2L7bN6uGqw9LpScDrGGF5
 micrOS/source/web/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 micrOS/source/web/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 micrOS/source/web/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-microsdevtoolkit-2.17.0.data/scripts/devToolKit.py,sha256=4GutIOErF1ny0HSNWQZzEneZdUWhSdqKPBjpRFTr5do,11192
-microsdevtoolkit-2.17.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+microsdevtoolkit-2.17.1.data/scripts/devToolKit.py,sha256=4GutIOErF1ny0HSNWQZzEneZdUWhSdqKPBjpRFTr5do,11192
+microsdevtoolkit-2.17.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
 toolkit/DevEnvCompile.py,sha256=wNBf0T7w07SYC3eLFow3JtZApHQK-92Fu7CvJHqWuSM,13189
 toolkit/DevEnvOTA.py,sha256=8IfAcvV0L_H91FAiZDRBmC06cWOXXCpoSDO-JWE6CG4,26889
 toolkit/DevEnvUSB.py,sha256=WsVKtVePRG3JJz0rooNWtnV-wMjEva1EiI9S8vSq210,37013
@@ -305,15 +305,15 @@ toolkit/workspace/precompiled/Network.mpy,sha256=foBjsIZ1SafRplCw8v5GgDU_WjPTaRz
 toolkit/workspace/precompiled/Notify.mpy,sha256=i8LNNynvNxi-tA5QT0pQJ8NJ_DNxJNW4NTZRD6gGS7M,970
 toolkit/workspace/precompiled/Scheduler.mpy,sha256=S-ZS1N420Xew74F_90O4FvFvrvmRTMiCh-C8szrdhfI,2198
 toolkit/workspace/precompiled/Server.mpy,sha256=Q6kIxjxhbkJ1nvxiPQD_6KvQYNfOhM3NTWbLMAIZaWA,4896
-toolkit/workspace/precompiled/Shell.mpy,sha256=jNoIReiaZJjZHre1uEs778qc2NKK1OMaLEtZBK0799g,4821
+toolkit/workspace/precompiled/Shell.mpy,sha256=OHOR-0z3OB4eQaVnF6QoUTxzWLZDmKG2eLdkTAdb_cQ,4821
 toolkit/workspace/precompiled/Tasks.mpy,sha256=1iBQXjiJm-s8OfqL2hAehhG_EqSfmubVRAgrJw_rNhc,6660
 toolkit/workspace/precompiled/Time.mpy,sha256=3thC6iKW4UJdjNP-Jo1Ol0Zn-e4oy2H1wiIz7SH182E,2865
 toolkit/workspace/precompiled/Types.mpy,sha256=5QGhswa0jWAU1Ywpyl_92miQg4qDHReXLqq3iHBwUCs,1397
-toolkit/workspace/precompiled/Web.mpy,sha256=1htc810w1K2HYcMYdTnfextffueRyKTZUZZGvhk06RY,4015
+toolkit/workspace/precompiled/Web.mpy,sha256=X3-nqKYY_RSLsAspTFY_O7H5vkUR0OwECFbSyxqSUUc,4030
 toolkit/workspace/precompiled/_mpy.version,sha256=Kik-fvRGfWAmpEjKdJLq7nPOqYR_jVgB0aiXZ8LMvMA,6
 toolkit/workspace/precompiled/main.py,sha256=cVlhoWwU9dSKEol0HWPihFAPzrUUvzSGwZNNMrpyfSY,440
 toolkit/workspace/precompiled/micrOS.mpy,sha256=zNzWg5S_-sHW_kxX9FOPlMboGMCNe_kzc1WWdN1_PEg,1208
-toolkit/workspace/precompiled/micrOSloader.mpy,sha256=_bEuY-6W0D5ogEWjPGifXE0qYuD75WdNEPvUNdOpAdY,1538
+toolkit/workspace/precompiled/micrOSloader.mpy,sha256=jnrYRrHlo7YnBS2BTbF6-7lMJzyD3XoxhHLYel5ngd8,1578
 toolkit/workspace/precompiled/microIO.mpy,sha256=pyfx0fA6VPniMKvmOID9Uzkq0loakhntT59hbtinsH4,1722
 toolkit/workspace/precompiled/reset.mpy,sha256=D-ZwUk-oR8OAg5ERWJXErdPAGbx_3M13hK4IBawhIg0,217
 toolkit/workspace/precompiled/urequests.mpy,sha256=tG4ttpfHPkyNk5vvbXDHKZm8zYPNEw1NYE0Ltnrjca8,2516
@@ -336,7 +336,7 @@ toolkit/workspace/precompiled/modules/LM_aht10.mpy,sha256=ju5Xs_Krt212I6h2CSo7gl
 toolkit/workspace/precompiled/modules/LM_bme280.mpy,sha256=qDxvzKhQkPaKpgXB2KZZ3D8F9nTlDiVDISof7NXxXtQ,4438
 toolkit/workspace/precompiled/modules/LM_buzzer.mpy,sha256=m5jzlBr9r6bRAix-F4ebc_neubx48uThRxk173P75sY,5990
 toolkit/workspace/precompiled/modules/LM_cct.mpy,sha256=VuGs1sTDwcYq0G62xSd8UbcnXqIVxydnmV1GQrUgskc,3907
-toolkit/workspace/precompiled/modules/LM_cluster.mpy,sha256=qB-R2DjGerrev5cNJ8ZFSuAiYKzodtpP1OIfaxACnF8,2971
+toolkit/workspace/precompiled/modules/LM_cluster.mpy,sha256=GjZHkj6Y-XKBAnQRkEIPmKb_xEox9j738_531E8z1og,3020
 toolkit/workspace/precompiled/modules/LM_co2.mpy,sha256=ma_cjCG8LoBMq_dt74PsrL-sn6U61a58pl_JgyxXdDM,1487
 toolkit/workspace/precompiled/modules/LM_dashboard_be.py,sha256=KVaJH37TCJkEwZJdGAVKpJtZXyVqYKDupyJO5BXvI0c,966
 toolkit/workspace/precompiled/modules/LM_dht11.mpy,sha256=esQhbgiMGiGChsTUAn1VbG9K6JHU3tQAxRKKfVMloEQ,745
@@ -392,7 +392,7 @@ toolkit/workspace/precompiled/web/udashboard.js,sha256=42mPR_NU3jOqUgLi7yZv2L7bN
 toolkit/workspace/precompiled/web/ustyle.css,sha256=P-s8ENwAcWoZi5bocrK3_kVzEjaRFKtFvEF6JRh4MBY,1429
 toolkit/workspace/precompiled/web/uwidgets.js,sha256=BGeUSbNHn6PClgIgIE6QszwQVJ6j7lzgCBwvIX8cYgo,6631
 toolkit/workspace/precompiled/web/uwidgets_pro.js,sha256=gbkk3SVttEVvDCwde-pJhAh4k7GuCFPdcWNq32pcKPE,3639
-microsdevtoolkit-2.17.0.dist-info/METADATA,sha256=cK46J4Jpr8LhuXxRprdj2PbkpwY30vl21nxI6KF61EQ,55554
-microsdevtoolkit-2.17.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-microsdevtoolkit-2.17.0.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
-microsdevtoolkit-2.17.0.dist-info/RECORD,,
+microsdevtoolkit-2.17.1.dist-info/METADATA,sha256=3u5qBpL3EpfQAP1TaLziNBhQE2jrbLFUoaHpFS-E4jo,55554
+microsdevtoolkit-2.17.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+microsdevtoolkit-2.17.1.dist-info/top_level.txt,sha256=rOGOIXqLBdGZAoDTiLdZ9B_leFB7bMv7YabLwuIc2bc,25
+microsdevtoolkit-2.17.1.dist-info/RECORD,,