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

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.10.5-0'
+    MICROS_VERSION = '2.11.0-0'
 
     def __init__(self):
         """
@@ -106,7 +106,8 @@ class Shell:
             # No msg to work with
             return True
         msg_list = msg.strip().split()
-        local_cmd = not msg_list[-1].startswith(">>")   # intercon request check for shell commands
+        # INTERCON embedding: conf mode and remote call request check
+        is_local_cmd = self.__conf_mode or not msg_list[-1].startswith(">>")
 
         ##########################################
         #   [1] Handle built-in shell commands   #
@@ -114,7 +115,7 @@ class Shell:
         ##########################################
 
         # Hello message
-        if local_cmd and msg_list[0] == 'hello':
+        if is_local_cmd and msg_list[0] == 'hello':
             # For low level device identification - hello msg
             await self.a_send(f"hello:{self.__devfid}:{self.__hwuid}")
             return True
@@ -127,34 +128,34 @@ class Shell:
             return True
 
         # Version handling
-        if local_cmd and msg_list[0] == 'version':
+        if is_local_cmd and msg_list[0] == 'version':
             # For micrOS system version info
             await self.a_send(str(Shell.MICROS_VERSION))
             return True
 
         # Reboot micropython VM
-        if local_cmd and msg_list[0] == 'reboot':
+        if is_local_cmd and msg_list[0] == 'reboot':
             hard = False
             if len(msg_list) >= 2 and "-h" in msg_list[1]:
                 # reboot / reboot -h
                 hard = True
             await self.reboot(hard)
 
-        if local_cmd and msg_list[0].startswith('webrepl'):
+        if is_local_cmd and msg_list[0].startswith('webrepl'):
             if len(msg_list) == 2 and '-u' in msg_list[1]:
                 await Shell.webrepl(msg_obj=self.a_send, update=True)
             return await Shell.webrepl(msg_obj=self.a_send)
 
         # CONFIGURE MODE STATE: ACCESS FOR NODE_CONFIG.JSON
-        if local_cmd and msg_list[0].startswith('conf'):
+        if is_local_cmd and msg_list[0].startswith('conf'):
             self.__conf_mode = True
             return True
-        if local_cmd and msg_list[0].startswith('noconf'):
+        if is_local_cmd and msg_list[0].startswith('noconf'):
             self.__conf_mode = False
             return True
 
         # HELP MSG
-        if local_cmd and msg_list[0] == "help":
+        if is_local_cmd and msg_list[0] == "help":
             await self.a_send("[MICROS]")
             await self.a_send("   hello     - hello msg - for device identification")
             await self.a_send("   modules   - show active Load Modules")
@@ -185,7 +186,7 @@ class Shell:
 
         # [2] EXECUTE:
         # @1 Configure mode
-        if local_cmd and self.__conf_mode and len(msg_list) > 0:
+        if is_local_cmd and self.__conf_mode and len(msg_list) > 0:
             # Lock thread under config handling is threads available
             return await Shell._configure(self.a_send, msg_list)
         # @2 Command mode

micrOS/source/Tasks.py

@@ -98,9 +98,11 @@ class TaskBase:
     async def feed(sleep_ms=1):
         """
         Feed event loop
-        :param sleep_ms: in millisecond (min: 1)
+        :param sleep_ms: in millisecond
         """
         # TODO: feed WDT - preemptive cooperative multitasking aka reboot if no feed until X time period
+        if sleep_ms <= 0:
+            return await asyncio.sleep(0.000_000_1)     # 0 means: 100ns (Absolute minimum)
         return await asyncio.sleep_ms(sleep_ms)
 
     def __del__(self):
@@ -116,7 +118,7 @@ class NativeTask(TaskBase):
     - could be built in function or custom code from load modules
     """
 
-    def create(self, callback=None, tag=None):
+    def create(self, callback:callable=None, tag:str=None) -> bool:
         """
         Create async task with coroutine callback (no queue limit check!)
         + async socket server task
@@ -166,7 +168,7 @@ class MagicTask(TaskBase):
         self.__inloop = False        # [LM] Task while loop for LM callback
         self.__sleep = 20            # [LM] Task while loop - async wait (proc feed) [ms]
 
-    def create(self, callback=None, loop=None, sleep=None):
+    def create(self, callback:list=None, loop:bool=None, sleep:int=None) -> bool:
         """
         Create async task with function callback (with queue limit check)
         - wrap (sync) function into async task (task_wrapper)
@@ -295,11 +297,12 @@ class Manager:
         my_task.done.set()
 
     @staticmethod
-    def create_task(callback, tag=None, loop=False, delay=None):
+    def create_task(callback, tag:str=None, loop:bool=False, delay:int=None):
         """
         Primary interface
         Generic task creator method
             Create async Task with coroutine/list(lm call) callback
+        :param callback: list|callable
         """
         if isinstance(callback, list):
             # Check queue if task is Load Module

micrOS/source/Time.py

@@ -16,12 +16,14 @@ from utime import sleep_ms, time, mktime, localtime
 from Config import cfgput, cfgget
 from Debug import errlog_add, console_write
 from urequests import get as http_get
+from Files import OSPath, path_join
 
 
 class Sun:
     TIME = {}
     UTC = cfgget('utc')  # STORED IN MINUTE
     BOOTIME = None       # Initialize BOOTIME: Not SUN, but for system uptime
+    FILE_CACHE = path_join(OSPath.DATA, 'sun.cache')
 
 
 def set_time(year, month, mday, hour, minute, sec):
@@ -89,14 +91,14 @@ def ntp_time():
 
 def __sun_cache(mode):
     """
-    pds - persistent data structure
+    File cache
     modes:
         r - recover, s - save
     """
     if mode == 's':
         # SAVE CACHE
         try:
-            with open('sun.pds', 'w') as f:
+            with open(Sun.FILE_CACHE, 'w') as f:
                 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:
@@ -104,7 +106,7 @@ def __sun_cache(mode):
         return
     try:
         # RESTORE CACHE
-        with open('sun.pds', 'r') as f:
+        with open(Sun.FILE_CACHE, 'r') as f:
             buff = {data.split(':')[0]: data.split(':')[1].split('-')
                     for data in f.read().strip().split(';')}
             for k, v in buff.items():

micrOS/source/micrOS.py

@@ -9,7 +9,7 @@ Designed by Marcell Ban aka BxNxM
 #################################################################
 from Time import ntp_time, suntime
 from Tasks import Manager
-from Hooks import bootup, profiling_info
+from Hooks import bootup, profiling_info, enableESPNow
 from Network import auto_nw_config
 from Server import Server
 from Interrupts import enableInterrupt, enableCron, initEventIRQs
@@ -74,7 +74,10 @@ def micrOS():
 
     # [Server] as async task
     aio.create_task(Server().run_server(), tag='server')
-    profiling_info(label='[memUsage] SYSTEM IS UP')
+
+    # [ESPNow] server as async task
+    enableESPNow()
+    profiling_info(label='[memUsage] SYSTEM IS UP AND RUNNING')
 
     # [EVENT LOOP] Start async event loop
     aio.run_forever()

micrOS/source/microIO.py

@@ -30,17 +30,19 @@ def detect_platform():
     """
     Unified platform detection for micrOS
     """
-    if 'esp32' in platform:
+    if 'esp32' in platform:     # esp32 family
         board = str(uname()[-1]).lower()
         if 'tinypico' in board:
-            return 'tinypico'    # esp32 family - tinypico
+            return 'tinypico'
         if 'esp32s2' in board:
-            return 'esp32s2'     # esp32 family - esp32S2
+            return 'esp32s2'
         if 'esp32s3' in board:
-            return 'esp32s3'     # esp32 family - esp32s3
+            return 'esp32s3'
         if 'esp32c3' in board:
-            return 'esp32c3'     # esp32 family - esp32c3
-        return 'esp32'           # esp32 family - general
+            return 'esp32c3'
+        if 'esp32c6' in board:
+            return 'esp32c6'
+        return 'esp32'           # esp32 family: general
     return platform              # esp8266 or something else
 
 

{microsdevtoolkit-2.10.5.dist-info → microsdevtoolkit-2.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: micrOSDevToolKit
-Version: 2.10.5
+Version: 2.11.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -404,6 +404,7 @@ These parameters controlls micrOS core functionalities, so you can define an ent
 |   **`appwd`**       |   `ADmin123`  `<str>`       |       Yes       | Device system password.: Used in AP password (access point mode) + webrepl password + micrOS auth
 | **`boothook`**      |    `n/a` `<str>`            |      Yes        | Add Load Module execution(s) to the boot sequence. Separator `;`. Examples: `rgb load; cct load` but you can call any load module function here if you want to run it at boot time.
 | **`webui`**         |       `False`  `bool`       |      Yes        | Launch http rest server on port 80 (in parallel with micrOS shell on port 9008 aka `socport`). It has 2 endpoints: / aka main page (index.html) and /rest aka rest (json) interface for load module execution. Example: `<devfid>.local` or `<devfid>.local/rest` + optional parameters: `/rgb/toggle`. **Apple shortcuts compatible**
+| **`espnow`**         |     `False`  `bool`       |      Yes        | Enable **ESPNow communication protocol**. It starts `espnow.server` task, that can receive espnow messages and execute Load Module commands. It is an extension for **InterCon** feature example: `system heartbeat >>target.local`. 
 | | |
 | **`cron`**          |     `False`  `<bool>`       |       Yes       | Enable timestamp based Load Module execution aka Cron scheduler (linux terminology), Timer(1) hardware interrupt enabler.
 | **`crontasks`**     |     `n/a`  `<str>`          |       Yes       | Cron scheduler input, task format: `WD:H:M:S!module function` e.g.: `1:8:0:0!system heartbeat`, task separator in case of multiple tasks: `;`. [WD:0-6, H:0-23, M:0-59, S:0-59] in case of each use: `*`. Instead `WD:H:M:S` you can use suntime tags: `sunset`, `sunrise`, optional offset: `sunset+-<minutes>`, `sunrise+-<minutes>`, example: `sunset-30!system heartbeat`. Range of days: WD can be conrete day number or range like: 0-2 means Monday to Wednesday.