micrOSDevToolKit 2.11.0__py3-none-any.whl → 2.13.0__py3-none-any.whl

micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -1,11 +1,11 @@
 {
     "files": {
         "Time.py": [
-            9.17,
+            9.26,
             6
         ],
         "Files.py": [
-            9.35,
+            9.38,
             8
         ],
         "micrOSloader.py": [
@@ -21,7 +21,7 @@
             3
         ],
         "Web.py": [
-            9.26,
+            9.64,
             1
         ],
         "Tasks.py": [
@@ -53,7 +53,7 @@
             4
         ],
         "Common.py": [
-            9.84,
+            9.74,
             34
         ],
         "InterConnect.py": [
@@ -93,7 +93,7 @@
             0
         ],
         "urequests.py": [
-            8.96,
+            9.31,
             5
         ],
         "LM_roboarm.py": [
@@ -105,7 +105,7 @@
             1
         ],
         "LM_pacman.py": [
-            8.95,
+            8.92,
             0
         ],
         "LM_genIO.py": [
@@ -113,11 +113,11 @@
             0
         ],
         "LM_oled_ui.py": [
-            8.65,
+            8.73,
             0
         ],
         "LM_system.py": [
-            8.28,
+            8.36,
             5
         ],
         "LM_robustness.py": [
@@ -141,7 +141,7 @@
             0
         ],
         "LM_oled.py": [
-            9.09,
+            9.23,
             4
         ],
         "LM_tinyrgb.py": [
@@ -153,7 +153,7 @@
             0
         ],
         "LM_bme280.py": [
-            8.04,
+            8.09,
             0
         ],
         "LM_buzzer.py": [
@@ -173,7 +173,7 @@
             0
         ],
         "LM_oled_sh1106.py": [
-            8.54,
+            8.89,
             2
         ],
         "LM_haptic.py": [
@@ -185,7 +185,7 @@
             0
         ],
         "LM_neopixel.py": [
-            7.54,
+            7.66,
             2
         ],
         "LM_cct.py": [
@@ -237,11 +237,11 @@
             0
         ],
         "LM_sound_event.py": [
-            8.46,
+            8.49,
             0
         ],
         "LM_oledui.py": [
-            7.95,
+            8.34,
             0
         ],
         "LM_espnow.py": [
@@ -253,11 +253,11 @@
             0
         ],
         "LM_OV2640.py": [
-            9.11,
+            9.19,
             0
         ],
         "LM_rgb.py": [
-            8.88,
+            8.95,
             1
         ],
         "LM_distance.py": [
@@ -281,11 +281,11 @@
             4
         ],
         "LM_mqtt_pro.py": [
-            9.35,
+            9.44,
             0
         ],
         "LM_trackball.py": [
-            8.31,
+            8.49,
             1
         ],
         "LM_dashboard_be.py": [
@@ -305,7 +305,7 @@
             2
         ],
         "LM_i2s_mic.py": [
-            8.3,
+            8.37,
             2
         ],
         "LM_sdcard.py": [
@@ -313,17 +313,17 @@
             0
         ],
         "LM_neomatrix.py": [
-            8.72,
+            8.8,
             0
         ]
     },
     "summary": {
         "core": [
-            3723,
+            3751,
             24
         ],
         "load": [
-            9410,
+            9449,
             55
         ],
         "core_dep": [
@@ -334,8 +334,8 @@
             true,
             5
         ],
-        "core_score": 9.19,
-        "load_score": 8.35,
-        "version": "2.11.0-0"
+        "core_score": 9.23,
+        "load_score": 8.39,
+        "version": "2.13.0-0"
     }
 }

micrOS/source/Common.py

@@ -3,7 +3,7 @@ micrOS Load Module programming Official API-s
     Designed by Marcell Ban aka BxNxM
 """
 from Server import Server, WebCli
-from Debug import errlog_add, console_write
+from Debug import syslog as debug_syslog, console_write
 from Logger import logger, log_get
 from Files import OSPath, path_join
 from microIO import resolve_pin
@@ -80,7 +80,7 @@ def notify(text=None) -> bool:
     try:
         out = Notify.notify(text)
     except Exception as e:
-        errlog_add(f"[ERR] Notify: {e}")
+        debug_syslog(f"[ERR] Notify: {e}")
         out = str(e)
     if out is not None and (out.startswith('Sent') or out.endswith('disabled')):
         return True
@@ -136,8 +136,8 @@ def data_logger(f_name, data=None, limit=12, msgobj=None):
 
 
 def syslog(msg):
-    """ Wrapper of errlog_add """
-    return errlog_add(f"{msg}")
+    """ Wrapper of debug_syslog """
+    return debug_syslog(f"{msg}")
 
 
 def console(msg):
@@ -155,6 +155,16 @@ def data_dir(f_name=None):
         return root_path
     return path_join(root_path, f_name)
 
+def web_dir(f_name=None):
+    """
+    Access for web dir path
+    :param f_name: if given, returns full path, otherwise returns web dir root path
+    """
+    root_path = OSPath.WEB
+    if f_name is None:
+        return root_path
+    return path_join(root_path, f_name)
+
 #####################################################################################
 #                             CHANNEL: SIGNAL GENERATORS                            #
 #####################################################################################
@@ -238,25 +248,27 @@ class AnimationPlayer:
     Generic async animation (generator) player.
     """
 
-    def __init__(self, animation:callable=None, tag:str=None, batch_draw:bool=False, batch_size:int=None):
+    def __init__(self, animation:callable=None, tag:str=None, batch_draw:bool=False, batch_size:int=None, loop:bool=True):
         """
         Initialize the AnimationPlayer with an optional animation.
         :param animation: Function to GENERATE animation data
         :param tag: Optional task tag for micro_task management.
         :param batch_draw: If True - draw in batches
         :param batch_size: Number of pixels per batch when drawing
+        :param loop: If True - loop the animation (default)
         """
         self.animation:callable = None
         self.batch_draw:bool = batch_draw
         self.__max_batch_size:int = 256                     # MAX BATCH SIZE - ASYNC PROTECTION
         self.__batch_size:int = 8                           # Default batch size: 8
+        self.__loop:bool = loop                             # Loop the animation (generator)
         self._set_batch_size(batch_size)                    # Set batch size from parameter
         self._player_speed_ms:int = 10                      # Default speed in ms between frames
         main_tag:str = tag if tag else "animation"
         self._task_tag:str = f"{main_tag}.player"
         if animation is not None and not self._set_animation(animation):
             raise Exception("Invalid animation function provided.")
-        self._running:bool = True
+        self.__running:bool = True
 
     def _set_animation(self, animation:callable) -> bool:
         """
@@ -289,7 +301,7 @@ class AnimationPlayer:
             clear()
         for data in self.animation():
             # Check if animation has changed under the loop
-            if not self._running or self.animation != current_animation:
+            if not self.__running or self.animation != current_animation:
                 # Animation changed — break — clean and restart animation loop.
                 clear()
                 break
@@ -312,13 +324,15 @@ class AnimationPlayer:
         Async task to play the current animation.
         """
         with micro_task(tag=self._task_tag) as my_task:
-            while self._running:
+            while self.__running:
                 my_task.out = f"Play {self.animation.__name__} ({self._player_speed_ms}ms/frame)"
                 try:
                     await self._render(my_task)
                 except IndexError:
                     # Draw after generator exhausted and Restart animation if IndexError occurs
                     self.draw()
+                    if not self.__loop:
+                        break
                     await my_task.feed(sleep_ms=self._player_speed_ms)
                     my_task.out = "Restart animation"
                 except Exception as e:
@@ -326,12 +340,13 @@ class AnimationPlayer:
                     break
             my_task.out = f"Animation stopped...{my_task.out}"
 
-    def control(self, play_speed_ms:int, bt_draw:bool=None, bt_size:int=None):
+    def control(self, play_speed_ms:int, bt_draw:bool=None, bt_size:int=None, loop:bool=None):
         """
         Set/Get current play speed of the animation.
         :param play_speed_ms: player loop speed in milliseconds.
         :param bt_draw: batch drawing flag.
         :param bt_size: batch drawing size.
+        :param loop: loop flag.
         """
         if isinstance(play_speed_ms, int):
             self._player_speed_ms = max(0, min(10000, int(play_speed_ms)))
@@ -339,17 +354,22 @@ class AnimationPlayer:
             self.batch_draw = bt_draw
         if isinstance(bt_size, int):
             self._set_batch_size(bt_size)
+        if isinstance(loop, bool):
+            self.__loop = loop
         return {"realtime": not self.batch_draw, "batched": self.batch_draw,
-                "size": self.__batch_size, "speed_ms": self._player_speed_ms}
+                "size": self.__batch_size, "speed_ms": self._player_speed_ms,
+                "loop": self.__loop}
 
 
-    def play(self, animation=None, speed_ms=None, bt_draw=False, bt_size=None):
+    def play(self, animation=None, speed_ms=None, bt_draw=False, bt_size=None, loop=True):
         """
         Play animation via generator function.
         :param animation: Animation generator function.
         :param speed_ms: Speed of the animation in milliseconds. (min.: 3ms)
         :param bt_draw: batch drawing flag.
         :param bt_size: batch drawing size.
+        :param loop: Loop the animation.
+        :return: Player settings.
         """
 
         if animation is not None:
@@ -358,9 +378,9 @@ class AnimationPlayer:
         if self.animation is None:
             return "No animation to play"
         # Handle player settings
-        settings = self.control(play_speed_ms=speed_ms, bt_draw=bt_draw, bt_size=bt_size)
+        settings = self.control(play_speed_ms=speed_ms, bt_draw=bt_draw, bt_size=bt_size,  loop=loop)
         # Ensure async loop set up correctly. (After stop operation, it is needed)
-        self._running = True
+        self.__running = True
         # [!] ASYNC TASK CREATION
         raw_state:bool = micro_task(tag=self._task_tag, task=self._player())
         state = "starting" if raw_state else "running"
@@ -371,7 +391,7 @@ class AnimationPlayer:
         """
         Stop the animation.
         """
-        self._running = False
+        self.__running = False
         return "Stop animation player"
 
     def update(self, *arg, **kwargs):

micrOS/source/Config.py

@@ -16,11 +16,11 @@ from re import search
 from json import load, dump
 from uos import remove
 from utime import sleep
-from Debug import DebugCfg, console_write, errlog_add
+from Debug import DebugCfg, console_write, syslog
 try:
     from microIO import set_pinmap
 except:
-    errlog_add("[ERR] LogicalPins import: set_pinmap")
+    syslog("[ERR] LogicalPins import: set_pinmap")
     set_pinmap = None
 
 
@@ -109,7 +109,7 @@ class Data:
             Data.write_cfg_file()
             console_write("[CONF] Save conf successful")
         except Exception as e:
-            errlog_add(f"[ERR] Save (__inject) conf failed: {e}")
+            syslog(f"[ERR] Save (__inject) conf failed: {e}")
         finally:
             del liveconf
 
@@ -127,7 +127,7 @@ class Data:
                 if nosafe:
                     break
                 sleep(0.2)
-                errlog_add(f'[ERR] read_cfg_file error: {e}')
+                syslog(f'[ERR] read_cfg_file error: {e}')
         # Return config cache
         return conf
 
@@ -140,7 +140,7 @@ class Data:
                     dump(Data.CONFIG_CACHE, f)
                 break
             except Exception as e:
-                errlog_add(f'[ERR] write_cfg_file {Data.CONFIG_PATH} (json): {e}')
+                syslog(f'[ERR] write_cfg_file {Data.CONFIG_PATH} (json): {e}')
             sleep(0.2)
         return True
 
@@ -217,7 +217,7 @@ def cfgget(key=None):
             return Data.disk_keys(key)
         return val
     except Exception as e:
-        errlog_add(f'[ERR] cfgget {key} error: {e}')
+        syslog(f'[ERR] cfgget {key} error: {e}')
     return None
 
 def cfgput(key, value, type_check=False):
@@ -242,7 +242,7 @@ def cfgput(key, value, type_check=False):
         del value
         return True
     except Exception as e:
-        errlog_add(f'[ERR] cfgput {key} error: {e}')
+        syslog(f'[ERR] cfgput {key} error: {e}')
         return False
 
 #################################################################

micrOS/source/Debug.py

@@ -6,9 +6,9 @@ micrOS Console and Log write interface implementations.
 
 from machine import Pin
 try:
-    from Logger import syslog
+    from Logger import syslog as logger_syslog
 except:
-    syslog = None
+    logger_syslog = None
 try:
     from microIO import resolve_pin, pinmap_search, register_pin
 except:
@@ -46,13 +46,13 @@ class DebugCfg:
                 # Set function callback for step function (simple led - blink)
                 DebugCfg.PLED_STEP = lambda: led_obj.value(not led_obj.value())  # # double-blink: return None
             except Exception as e:
-                errlog_add(f"[PLED] led error: {e}")
+                syslog(f"[PLED] led error: {e}")
         elif callable(pled):
             # [MODE] OVERRIDE PROGRESS LED WITH CUSTOM step FUNCTION
             DebugCfg.PLED_STEP = pled
             DebugCfg._auto_register_pin()
         else:
-            errlog_add(f"[WARN] pled type not supported: {pled}")
+            syslog(f"[WARN] pled type not supported: {pled}")
 
 
     @staticmethod
@@ -62,7 +62,7 @@ class DebugCfg:
             if isinstance(pin, int):
                 register_pin('builtin', pin)
         except Exception as e:
-            errlog_add(f"[ERR] pled pin registration: {e}", console=False)
+            syslog(f"[ERR] pled pin registration: {e}", console=False)
 
 
     @staticmethod
@@ -75,7 +75,7 @@ class DebugCfg:
             if callable(DebugCfg.PLED_STEP):
                 return DebugCfg.PLED_STEP()         # Run step function (return None: double-blink OR True: no d-b)
         except Exception as e:
-            errlog_add(f"[PLED] step error: {e}")
+            syslog(f"[PLED] step error: {e}")
         return True
 
 
@@ -87,10 +87,10 @@ def console_write(msg):
             if analog is None:
                 DebugCfg.step()             # Double-blink
         except Exception as e:
-            errlog_add(f"[ERR] console_write: {e}", console=False)
+            syslog(f"[ERR] console_write: {e}", console=False)
 
 
-def errlog_add(data, console=True):
+def syslog(data, console=True):
     """
     :param data: msg string / data
     :param console: activate console_write (default: True)
@@ -98,4 +98,4 @@ def errlog_add(data, console=True):
     """
     if console:
         console_write(data)
-    return False if syslog is None else syslog(data)
+    return False if logger_syslog is None else logger_syslog(data)

micrOS/source/Espnow.py

@@ -4,7 +4,7 @@ from Tasks import NativeTask, TaskBase, lm_exec, lm_is_loaded
 import uasyncio as asyncio
 from Network import get_mac
 from Config import cfgget
-from Debug import errlog_add
+from Debug import syslog
 
 
 # ----------- PARSE AND RENDER MSG PROTOCOL  --------------
@@ -14,7 +14,7 @@ def render_response(tid, oper, data, prompt) -> str:
     Render ESPNow custom message (protocol)
     """
     if oper not in ("REQ", "RSP"):
-        errlog_add(f"[ERR] espnow render_response, unknown oper: {oper}")
+        syslog(f"[ERR] espnow render_response, unknown oper: {oper}")
     tmp = "{tid}|{oper}|{data}|{prompt}$"
     tmp = tmp.replace("{tid}", str(tid))
     tmp = tmp.replace("{oper}", str(oper))
@@ -68,7 +68,7 @@ class ResponseRouter:
         # USE <tid> for proper session response mapping
         router = ResponseRouter._routes.get(mac)
         if router is None:
-            errlog_add(f"[WARN][ESPNOW] No response route for {mac}")
+            syslog(f"[WARN][ESPNOW] No response route for {mac}")
             return
         router.response = response
         router._event.set()
@@ -157,7 +157,7 @@ class ESPNowSS:
                     if state:
                         await self.__asend_raw(mac, response)
                     else:
-                        errlog_add(response)
+                        syslog(response)
                 except OSError as err:
                     # If the peer is not yet added, add it and retry.
                     if len(err.args) > 1 and err.args[1] == 'ESP_ERR_ESPNOW_NOT_FOUND':
@@ -166,10 +166,10 @@ class ESPNowSS:
                         if state:
                             await self.__asend_raw(mac, response)
                         else:
-                            errlog_add(response)
+                            syslog(response)
                     else:
                         # Optionally handle or log other OSErrors here.
-                        errlog_add(f"[ERR][NOW SERVER] {err}")
+                        syslog(f"[ERR][NOW SERVER] {err}")
 
     def start_server(self):
         """

micrOS/source/Files.py

@@ -111,9 +111,11 @@ def path_join(*parts):
 # micrOS system file structure
 class OSPath:
     _ROOT = getcwd()
-    LOGS = path_join(_ROOT, '/logs')        # system/user logs
-    DATA = path_join(_ROOT,'/data')         # application data
-    WEB = path_join(_ROOT,'/web')           # web resources
+    LOGS = path_join(_ROOT, '/logs')        # Logs (.log)
+    DATA = path_join(_ROOT,'/data')         # Application data (.dat, .cache, etc.)
+    WEB = path_join(_ROOT,'/web')           # Web resources (.html, .css, .js, .json, etc.)
+    MODULES = path_join(_ROOT, '/modules')  # Application modules (.mpy, .py) (todo)
+    CONFIG = path_join(_ROOT, '/config')    # System configuration files (node_config.json, etc.)(todo)
 
     @property
     def ROOT(self):

micrOS/source/Hooks.py

@@ -19,7 +19,7 @@ Designed by Marcell Ban aka BxNxM
 #################################################################
 from Config import cfgget, cfgput
 from microIO import detect_platform
-from Debug import console_write, errlog_add
+from Debug import console_write, syslog
 from Tasks import exec_lm_pipe
 from Files import OSPath, is_dir
 from uos import mkdir
@@ -76,9 +76,9 @@ def _init_micros_dirs():
         if not is_dir(dir_path):
             try:
                 mkdir(dir_path)
-                errlog_add(f"[BOOT] init dir: {dir_path}")
+                syslog(f"[BOOT] init dir: {dir_path}")
             except Exception as e:
-                errlog_add(f"[ERR][BOOT] cannot init dir {dir_path}: {e}")
+                syslog(f"[ERR][BOOT] cannot init dir {dir_path}: {e}")
 
 
 def _tune_queue_size():
@@ -137,7 +137,7 @@ def boot_cause():
             reason = 4, "DSWakeUp"
         elif reset_reason == SOFT_RESET:
             reason = 5, "SoftReset"
-    errlog_add(f"[BOOT] info: {reason[1]}")
+    syslog(f"[BOOT] info: {reason[1]}")
     return reason
 
 
@@ -151,6 +151,6 @@ def enableESPNow() -> str:
             verdict = ESPNowSS().start_server()
             console_write(f"[TASK] Start ESPNow-InterCon server: {verdict}")
         except Exception as e:
-            errlog_add(f"[ERR] Start ESPNow-InterCon server: {e}")
+            syslog(f"[ERR] Start ESPNow-InterCon server: {e}")
             return str(e)
     return "ESPNow disabled"

micrOS/source/InterConnect.py

@@ -1,7 +1,7 @@
 from socket import getaddrinfo, SOCK_STREAM
 from re import compile
 from uasyncio import open_connection
-from Debug import errlog_add
+from Debug import syslog
 from Config import cfgget
 from Server import Server
 from Tasks import NativeTask
@@ -41,7 +41,7 @@ class InterCon:
                     host = addr_info[-1][4][0]
                 except OSError as e:
                     Server.reply_all(f"[intercon] NoHost: {e}")
-                    errlog_add(f"[intercon] send_cmd {host} oserr: {e}")
+                    syslog(f"[intercon] send_cmd {host} oserr: {e}")
                     return ''
             else:
                 # Restore IP from cache by hostname
@@ -55,7 +55,7 @@ class InterCon:
                 output = await self.__run_command(cmd, hostname)
             except OSError as e:
                 Server.reply_all(f"[intercon] NoHost: {e}")
-                errlog_add(f"[intercon] send_cmd {host} oserr: {e}")
+                syslog(f"[intercon] send_cmd {host} oserr: {e}")
                 output = None
             finally:
                 if self.writer:
@@ -69,7 +69,7 @@ class InterCon:
             # None: ServerBusy(or \0) or Prompt mismatch (auto delete cached IP), STR: valid comm. output
             return output
         else:
-            errlog_add(f"[ERR][intercon] Invalid host: {host}")
+            syslog(f"[ERR][intercon] Invalid host: {host}")
         return ''
 
     async def __run_command(self, cmd:list, hostname:str):
@@ -103,7 +103,7 @@ class InterCon:
             await self.writer.drain()
             data, prompt = await self.__receive_data(prompt=prompt)
         except Exception as e:
-            errlog_add(f'[intercon][ERR] Auth: {e}')
+            syslog(f'[intercon][ERR] Auth: {e}')
             data = 'AuthFailed'
         if 'AuthOk' in data:
             return True             # AuthOk

micrOS/source/Interrupts.py

@@ -19,7 +19,7 @@ Reference: https://docs.micropython.org/en/latest/library/machine.Pin.html
 from machine import Pin
 from utime import ticks_ms, ticks_diff
 from Config import cfgget
-from Debug import console_write, errlog_add
+from Debug import console_write, syslog
 from Tasks import exec_lm_pipe_schedule
 from microIO import resolve_pin
 if cfgget('cron'):
@@ -157,7 +157,7 @@ def initEventIRQs():
         try:
             return resolve_pin(_p)
         except Exception as e:
-            errlog_add(f'[ERR][!] EVENT {_p} IO error: {e}')
+            syslog(f'[ERR][!] EVENT {_p} IO error: {e}')
         return None
 
     # Load External IRQ (1-4) execution data set from node config

micrOS/source/LM_dashboard_be.py

@@ -1,4 +1,4 @@
-from Common import web_endpoint, syslog
+from Common import web_dir, web_endpoint, syslog
 
 ENDPOINT_INITED = False
 
@@ -8,7 +8,7 @@ def load():
 
 def _dashboard_clb():
     try:
-        with open('dashboard.html', 'r') as html:
+        with open(web_dir('dashboard.html'), 'r') as html:
             html_content = html.read()
         return 'text/html', html_content
     except Exception as e: