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

micrOS/source/{LM_pacman.py → modules/LM_pacman.py}

@@ -1,21 +1,22 @@
 from sys import modules
 from Common import socket_stream
-from Files import _is_module, list_fs, ilist_fs, remove_fs, OSPath, path_join
+from Files import is_protected, list_fs, ilist_fs, remove_fs, OSPath, path_join
 
 
 #############################################
 #     Safe file system handler functions    #
 #############################################
 
-def ls(path="/", content='*', raw=False, select='*'):
+def ls(path="/", content='*', raw=False, select='*', core=False):
     """
     Linux like ls command - list app resources and app folders
     :param path: path to list, default: /
     :param content: content type, default all, f-file, d-dir can be selected
     :param raw: keep raw output [(is_app, type), ...]
     :param select: select specific app resource: LM or IO, default: all
+    :param core: include core system files
     """
-    items = list_fs(path, content, select=select)
+    items = list_fs(path, content, select=select, core=core)
     if raw:
         return items
 
@@ -39,10 +40,10 @@ def rm(path, allow_dir=False):
     return remove_fs(path, allow_dir)
 
 
-def dirtree(path="/", raw=False):
+def dirtree(path="/", raw=False, core=False):
     """Return only directories from a given path."""
     path = path if path.endswith('/') else f"{path}/"
-    folders = [path_join(path, item) for item in ilist_fs(path, type_filter='d')]
+    folders = [path_join(path, item) for item in ilist_fs(path, type_filter='d', core=core)]
     folder_contents = {folder:list_fs(folder) for folder in folders}
     if raw:
         return folder_contents
@@ -54,15 +55,40 @@ def dirtree(path="/", raw=False):
     return formatted_output
 
 
+def cat(path):
+    """
+    Dump any file content
+    """
+    with open(path, 'r') as f:
+        content = f.read()
+    return content
+
+
 def download(url=None, package=None):
     """
     [BETA] Load Module downloader with mip
     :param url: github url path, ex. BxNxM/micrOS/master/toolkit/workspace/precompiled/LM_robustness.py
     :param package: mip package name or raw url (hack)
     """
+    def _install(target=None):
+        nonlocal url, verdict
+        try:
+            verdict += f"Install {url}\n"
+            if target is None:
+                install(url)                    # Default download: /lib
+            else:
+                install(url, target=target)     # Custom target
+            verdict += "\n|- Done"
+        except Exception as e:
+            verdict += f"|- Cannot install: {url}\n{e}"
+        return verdict
+
+    from mip import install
+    verdict = ""
     if url is None and package is None:
         return "Nothing to download, url=None package=None"
     if package is None:
+        verdict += "Install from GitHub URL"
         base_url = "https://raw.githubusercontent.com/"
         file_name = url.split("/")[-1]
         if not(file_name.endswith("py") and file_name.startswith("LM_")):
@@ -72,26 +98,19 @@ def download(url=None, package=None):
             url = url.replace("https://github.com/", base_url).replace("/blob", "")
         else:
             url = f"{base_url}{url}"
-    else:
-        url = package
-    from mip import install
-    verdict = ""
-    try:
-        verdict += f"Install {url}\n"
-        install(url)
-        verdict += "\n|- Done"
-    except Exception as e:
-        verdict += f"|- Cannot install: {url}\n{e}"
-    return verdict
+        return _install(target=OSPath.MODULES)          # Install module from Github URL
+    url = package
+    return _install()                                   # Install official package
 
 
-def del_duplicates():
+def del_duplicates(migrate=True):
     """
     Load module package manager (Not just load modules)
     - delete duplicated .mpy and .py resources, keep .mpy resource!
     """
+    modules_path = OSPath.MODULES
     msg_buf = []
-    files =  list_fs(type_filter='f', select='LM')
+    files =  list_fs(path=modules_path, type_filter='f', select='LM')
     py = list((res.split('.')[0] for res in files if res.endswith('.py')))       # Normally smaller list
     mpy = (res.split('.')[0] for res in files if res.endswith('.mpy'))
     for m in mpy:
@@ -100,11 +119,36 @@ def del_duplicates():
         if m in py and m != 'main':
             to_delete = f'{m}.py'
             try:
-                verdict = remove_fs(to_delete)
+                verdict = remove_fs(path_join(modules_path, to_delete))
             except:
                 verdict = "n/a"
                 state = False
             msg_buf.append(f'   Delete {to_delete} {state} - {verdict}')
+
+
+    # MIGRATE /ROOT/LMs & IOs -> /modules
+    def _migrate_from_root(_rf):
+        nonlocal _deleted, files
+        if _rf in files:
+            remove_fs(path_join(OSPath._ROOT, _rf))
+            if _rf in ("LM_pacman.mpy", "LM_system.mpy"):
+                # Delete protected LMs from root
+                remove(path_join(OSPath._ROOT, _rf))
+            _deleted += 1
+        else:
+            rename(path_join(OSPath._ROOT, _rf), path_join(modules_path, _rf))
+            msg_buf.append(f'   Move /{_rf} -> modules/{_rf}')
+    if migrate:
+        from uos import rename, remove
+        _deleted = 0
+        files = files + list_fs(path=OSPath._ROOT, type_filter='f', select='IO')
+        for rf in ilist_fs(path=OSPath._ROOT, type_filter='f', select='LM'):
+            _migrate_from_root(rf)
+        for rf in ilist_fs(path=OSPath._ROOT, type_filter='f', select='IO'):
+            _migrate_from_root(rf)
+        if _deleted > 0:
+            msg_buf.append(f'   Purged (/): {_deleted}')
+
     return '\n'.join(msg_buf) if len(msg_buf) > 0 else 'Nothing to delete.'
 
 
@@ -188,7 +232,7 @@ def listmods(msgobj=None):
     """
     # Dump available LMs
     msg_buf = []
-    for k in (res.replace('LM_', '') for res in ilist_fs(type_filter='f', select='LM')):
+    for k in (res.replace('LM_', '') for res in ilist_fs(path=OSPath.MODULES, type_filter='f', select='LM')):
         if msgobj is None:
             msg_buf.append(f'   {k}')
         else:
@@ -203,13 +247,14 @@ def delmod(mod):
         Delete Load Module with full name: module.py or module.mpy
         OR delete any web resource: *.js, *.css, *.html
     """
-    if mod.endswith('py') or _is_module(mod):
-        try:
-            to_remove = f'LM_{mod}' if mod.endswith('py') else mod
-            return remove_fs(to_remove)
-        except Exception as e:
-            return f'Cannot delete: {mod}: {e}'
-    return f'Invalid value: {mod}'
+    if mod.endswith('py'):
+        to_remove = f'LM_{mod}'
+    else:
+        return f'Invalid {mod}, must ends with .py or .mpy'
+    try:
+        return remove_fs(path_join(OSPath.MODULES, to_remove))
+    except Exception as e:
+        return f'Cannot delete: {mod}: {e}'
 
 
 @socket_stream
@@ -218,7 +263,7 @@ def micros_checksum(msgobj=None):
     from binascii import hexlify
     from Config import cfgget
 
-    for f_name in ilist_fs(type_filter='f', select='LM'):
+    for f_name in ilist_fs(path=OSPath.MODULES, type_filter='f', select='LM'):
         with open(f_name, 'rb') as f:
             cs = hexlify(sha1(f.read()).digest()).decode('utf-8')
         msgobj(f"{cs} {f_name}")
@@ -233,7 +278,7 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return ('listmods', 'delmod mod=<module>.py/.mpy or .js/.html/.css', 'del_duplicates',
+    return ('listmods', 'delmod mod=<module>.py/.mpy', 'del_duplicates',
             'moduls unload="LM_rgb/None"',
             'cachedump delete=None',
             'datdump',

micrOS/source/{LM_presence.py → modules/LM_presence.py}

@@ -67,7 +67,7 @@ def __run_intercon(state):
             host = cmd[0]
             cmd = cmd[1:]
             # Send CMD to other device
-            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
+            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True)
         except Exception as e:
             syslog(f"__run_intercon error: {e}")
     if state.lower() == "off":
@@ -78,7 +78,7 @@ def __run_intercon(state):
             host = cmd[0]
             cmd = cmd[1:]
             # Send CMD to other device
-            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True, skip_check=True)
+            state, _ = exec_cmd(cmd + [f">>{host}"], jsonify=True)
         except Exception as e:
             syslog(f"__run_intercon error: {e}")
 

micrOS/source/{LM_robustness.py → modules/LM_robustness.py}

@@ -1,5 +1,5 @@
 from LM_system import memory_usage
-from Common import socket_stream, syslog
+from Common import socket_stream, syslog, micro_task
 
 
 @socket_stream
@@ -61,6 +61,52 @@ def _recursion(cnt, msgobj=None):
         remain = 0
     return remain
 
+################## TEST micro_task UCs ##########################
+
+async def __task(tag, period_ms):
+    counter = 0
+    with micro_task(tag=tag) as my_task:
+        while True:
+            # DO something here in the async loop...
+            counter += 1
+
+            # Store data in task cache (task show mytask)
+            my_task.out = f'MyTask Counter: {counter}'
+
+            # Async sleep - feed event loop
+            await my_task.feed(sleep_ms=period_ms)
+            # [i] feed same as "await asyncio.sleep_ms(period_ms)" with micrOS features (WDT)
+
+def create_task():
+    """
+    Legacy way of task creation (with exact task tagging)
+    """
+    # [!] ASYNC TASK CREATION [1*] with async task callback + taskID (TAG) handling
+    task_tag = "microtask.run"
+    state = micro_task(tag=task_tag, task=__task(tag=task_tag, period_ms=5))
+    return "Starting" if state else "Already running"
+
+
+@micro_task("microtask", _wrap=True)
+async def mytask(tag, period_ms=30):
+    """
+    New shorter way of task creation
+     with decorator function
+    """
+    counter = 0
+    with micro_task(tag=tag) as my_task:
+        while True:
+            # DO something here in the async loop...
+            counter += 1
+
+            # Store data in task cache (task show mytask)
+            my_task.out = f'MyTask Counter: {counter}'
+
+            # Async sleep - feed event loop
+            await my_task.feed(sleep_ms=period_ms)
+            # [i] feed same as "await asyncio.sleep_ms(period_ms)" with micrOS features (WDT)
+
+##############################################################################
 
 def help(widgets=False):
     """
@@ -70,5 +116,6 @@ def help(widgets=False):
         (widgets=True) list of widget json for UI generation
     """
     return 'NOTE: This is a test module to validate system robustness', \
-           'raise_error', 'memory_leak cnt=160', 'recursion_limit cnt=14'
+           'raise_error', 'memory_leak cnt=160', 'recursion_limit cnt=14', \
+           'create_task', 'mytask'
 

micrOS/source/{LM_tcs3472.py → modules/LM_tcs3472.py}

@@ -17,20 +17,15 @@ class TCS3472:
     def __init__(self, bus, address=0x29):
         self._bus = bus
         self._i2c_address = address
-
-        self._bus.start()
-
         self._bus.writeto(self._i2c_address, b'\x80\x03')
         self._bus.writeto(self._i2c_address, b'\x81\x2b')
-
         TCS3472.INSTANCE = self
 
     def scaled(self):
         crgb = self.raw()
         if crgb[0] > 0:
             return tuple(float(x) / crgb[0] for x in crgb[1:])
-
-        return (0, 0, 0)
+        return 0, 0, 0
 
     def rgb(self):
         return tuple(int(x * 255) for x in self.scaled())
@@ -72,4 +67,7 @@ def measure():
 
 
 def help(widgest=False):
+    """
+    TCS3472 Color sensor
+    """
     return 'load', 'measure'

micrOS/source/web/dashboard.html

@@ -38,6 +38,7 @@
 </head>
 <body>
     <h1> micrOS dashboard </h1>
+    <p id="restInfo"></p>
     <!-- Container for the dynamically generated list -->
     <section id="widgets-section"></section>
     <br><br><br>
@@ -54,6 +55,7 @@
     <script>
         document.addEventListener("DOMContentLoaded", function() {
             // Init basic info from board after DOM is fully loaded
+            restInfo(showPages=false);
 
             // INIT DASHBOARD (load active modules -> build page)
             DynamicWidgetLoad();