micrOSDevToolKit 2.8.6__tar.gz → 2.9.0__tar.gz

{microsdevtoolkit-2.8.6/micrOSDevToolKit.egg-info → microsdevtoolkit-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: micrOSDevToolKit
-Version: 2.8.6
+Version: 2.9.0
 Summary: Development and deployment environment for micrOS, the diy micropython automation OS (IoT)
 Home-page: https://github.com/BxNxM/micrOS
 Author: Marcell Ban
@@ -28,7 +28,7 @@ Requires-Dist: soundfile
 
 # ![LOGO](./media/logo_mini.png?raw=true) micrOS
 
-> **"Simple, yet increadbly useful."**
+> **"The mini yet powerful operating system for DIY projects."**
 
 ![telnet](https://img.shields.io/badge/wifi-telnet-blue) ![esp32S2](https://img.shields.io/badge/esp32-S2-olive) ![tinypico](https://img.shields.io/badge/esp32-tinypico-olive) ![esp32S3](https://img.shields.io/badge/esp32-S3-olive) ![esp32S3](https://img.shields.io/badge/esp32-S3_RAM-olive) ![PYQT](https://img.shields.io/badge/esp32-PYQT-olive) ![raspberry-pico-w](https://img.shields.io/badge/raspberry-pico_W-critical) ![espCAM-esp-s](https://img.shields.io/badge/esp32-CAM_OV2640-olive) ![esp32-c3](https://img.shields.io/badge/esp32-C3_RISCV-olive) ![OTA](https://img.shields.io/badge/ota-update-blue) ![GPIO](https://img.shields.io/badge/gpio-i2c-success) ![clock](https://img.shields.io/badge/rtc-ntp-success) ![async](https://img.shields.io/badge/async-task_manager-success) ![irq](https://img.shields.io/badge/hardware-IRQs-success) ![socket](https://img.shields.io/badge/socket-STA_or_AP-blue) ![cron](https://img.shields.io/badge/scheduling-cron-success) ![stable](https://img.shields.io/badge/stabile-master_HEAD-success) ![stable](https://img.shields.io/badge/micropython-OS-gold)<br/>
 

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/README.md

@@ -1,6 +1,6 @@
 # ![LOGO](./media/logo_mini.png?raw=true) micrOS
 
-> **"Simple, yet increadbly useful."**
+> **"The mini yet powerful operating system for DIY projects."**
 
 ![telnet](https://img.shields.io/badge/wifi-telnet-blue) ![esp32S2](https://img.shields.io/badge/esp32-S2-olive) ![tinypico](https://img.shields.io/badge/esp32-tinypico-olive) ![esp32S3](https://img.shields.io/badge/esp32-S3-olive) ![esp32S3](https://img.shields.io/badge/esp32-S3_RAM-olive) ![PYQT](https://img.shields.io/badge/esp32-PYQT-olive) ![raspberry-pico-w](https://img.shields.io/badge/raspberry-pico_W-critical) ![espCAM-esp-s](https://img.shields.io/badge/esp32-CAM_OV2640-olive) ![esp32-c3](https://img.shields.io/badge/esp32-C3_RISCV-olive) ![OTA](https://img.shields.io/badge/ota-update-blue) ![GPIO](https://img.shields.io/badge/gpio-i2c-success) ![clock](https://img.shields.io/badge/rtc-ntp-success) ![async](https://img.shields.io/badge/async-task_manager-success) ![irq](https://img.shields.io/badge/hardware-IRQs-success) ![socket](https://img.shields.io/badge/socket-STA_or_AP-blue) ![cron](https://img.shields.io/badge/scheduling-cron-success) ![stable](https://img.shields.io/badge/stabile-master_HEAD-success) ![stable](https://img.shields.io/badge/micropython-OS-gold)<br/>
 

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/release_info/micrOS_ReleaseInfo/system_analysis_sum.json

@@ -5,11 +5,11 @@
             7
         ],
         "micrOSloader.py": [
-            7.85,
+            8.0,
             1
         ],
         "Hooks.py": [
-            9.41,
+            9.85,
             1
         ],
         "Server.py": [
@@ -17,40 +17,40 @@
             3
         ],
         "Web.py": [
-            9.05,
+            9.25,
             1
         ],
         "Tasks.py": [
-            9.78,
+            9.55,
             12
         ],
         "Config.py": [
-            9.44,
-            16
+            9.49,
+            17
         ],
         "reset.py": [
             8.75,
             0
         ],
         "Shell.py": [
-            9.61,
+            9.33,
             1
         ],
         "Notify.py": [
-            9.59,
-            2
+            8.38,
+            3
         ],
         "Types.py": [
-            8.87,
-            28
+            8.91,
+            29
         ],
         "Logger.py": [
-            8.57,
+            8.78,
             4
         ],
         "Common.py": [
-            9.49,
-            32
+            8.71,
+            34
         ],
         "InterConnect.py": [
             9.4,
@@ -62,14 +62,14 @@
         ],
         "Network.py": [
             9.71,
-            9
+            8
         ],
         "Espnow.py": [
             9.01,
             1
         ],
         "Scheduler.py": [
-            9.61,
+            9.62,
             1
         ],
         "microIO.py": [
@@ -77,7 +77,7 @@
             42
         ],
         "micrOS.py": [
-            9.29,
+            9.25,
             1
         ],
         "Interrupts.py": [
@@ -89,11 +89,11 @@
             0
         ],
         "urequests.py": [
-            8.94,
-            4
+            8.79,
+            5
         ],
         "LM_roboarm.py": [
-            7.78,
+            7.76,
             0
         ],
         "LM_stepper.py": [
@@ -109,8 +109,8 @@
             0
         ],
         "LM_system.py": [
-            8.31,
-            4
+            8.36,
+            5
         ],
         "LM_robustness.py": [
             7.57,
@@ -121,7 +121,7 @@
             0
         ],
         "LM_rest.py": [
-            7.0,
+            7.78,
             0
         ],
         "LM_oled.py": [
@@ -145,7 +145,7 @@
             0
         ],
         "LM_buzzer.py": [
-            8.9,
+            8.88,
             0
         ],
         "LM_switch.py": [
@@ -173,11 +173,11 @@
             0
         ],
         "LM_neopixel.py": [
-            7.59,
+            7.57,
             2
         ],
         "LM_cct.py": [
-            8.83,
+            8.82,
             1
         ],
         "LM_L9110_DCmotor.py": [
@@ -185,7 +185,7 @@
             0
         ],
         "LM_neoeffects.py": [
-            6.71,
+            6.86,
             0
         ],
         "LM_i2c.py": [
@@ -209,7 +209,7 @@
             0
         ],
         "LM_pet_feeder.py": [
-            8.0,
+            7.94,
             0
         ],
         "LM_rencoder.py": [
@@ -217,7 +217,7 @@
             0
         ],
         "LM_keychain.py": [
-            9.18,
+            9.17,
             0
         ],
         "LM_dht11.py": [
@@ -237,7 +237,7 @@
             0
         ],
         "LM_telegram.py": [
-            9.02,
+            9.53,
             0
         ],
         "LM_OV2640.py": [
@@ -245,11 +245,11 @@
             0
         ],
         "LM_rgb.py": [
-            8.66,
+            8.65,
             1
         ],
         "LM_distance.py": [
-            8.89,
+            8.87,
             0
         ],
         "LM_VL53L0X.py": [
@@ -257,7 +257,7 @@
             0
         ],
         "LM_light_sensor.py": [
-            8.99,
+            8.97,
             0
         ],
         "LM_rp2w.py": [
@@ -265,7 +265,7 @@
             0
         ],
         "LM_presence.py": [
-            8.78,
+            8.77,
             4
         ],
         "LM_trackball.py": [
@@ -277,7 +277,7 @@
             0
         ],
         "LM_dimmer.py": [
-            8.33,
+            8.32,
             1
         ],
         "LM_demo.py": [
@@ -315,11 +315,11 @@
     },
     "summary": {
         "core": [
-            3306,
+            3275,
             23
         ],
         "load": [
-            8711,
+            8939,
             55
         ],
         "core_dep": [
@@ -330,8 +330,8 @@
             true,
             6
         ],
-        "core_score": 9.13,
-        "load_score": 8.19,
-        "version": "2.8.1-0"
+        "core_score": 9.06,
+        "load_score": 8.22,
+        "version": "2.9.0-0"
     }
 }

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/Common.py

@@ -9,8 +9,7 @@ from Logger import logger, log_get
 from microIO import resolve_pin
 from Tasks import TaskBase, Manager, lm_exec
 from machine import Pin, ADC
-
-TELEGRAM = None
+from Notify import Notify
 
 ################## Common LM features ##################
 
@@ -78,7 +77,7 @@ class SmartADC:
         return {'raw': raw, 'percent': round(percent*100, 1), 'volt': volt}
 
     @staticmethod
-    def get_singleton(pin):                                         # TODO: rename to get_instance
+    def get_instance(pin):
         if pin in SmartADC.OBJS.keys():
             return SmartADC.OBJS[pin]
         SmartADC.OBJS[pin] = SmartADC(pin)
@@ -141,23 +140,18 @@ def exec_cmd(cmd, skip_check=False):
     return lm_exec(cmd) if isinstance(cmd, list) else False, f"Invalid type, must be list: {type(cmd)}"
 
 
-
-def notify(text):
+def notify(text=None) -> bool:
     """
     [LM] micrOS common notification handler (Telegram)
-    :param text: notification text
+    :param text: notification text / None (return notification state)
     return: verdict: True/False
     """
-    global TELEGRAM
-    if TELEGRAM is None:
-        try:
-            from Notify import Telegram
-            TELEGRAM = Telegram()
-        except Exception as e:
-            errlog_add(f"[ERR] Import Notify.Telegram: {e}")
-            return False
+    # (1) Return notification state
+    if text is None:
+        return Notify.GLOBAL_NOTIFY
+    # (2) Send notification
     try:
-        out = TELEGRAM.notify(text)
+        out = Notify.notify(text)
     except Exception as e:
         errlog_add(f"[ERR] Notify: {e}")
         out = str(e)
@@ -165,7 +159,8 @@ def notify(text):
         return True
     return False
 
-def web_endpoint(endpoint, function):
+
+def web_endpoint(endpoint, function) -> bool:
     """
     [LM] Add test endpoint <localhost.local>/endpoint from Load Modules
     :param endpoint: simple string, name of the endpoint
@@ -215,7 +210,7 @@ def data_logger(f_name, data=None, limit=12, msgobj=None):
 
 def syslog(msg):
     """ Wrapper of errlog_add """
-    return errlog_add(f"[U]{msg}")
+    return errlog_add(f"[U] {msg}")
 
 
 def console(msg):

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/Config.py

@@ -13,6 +13,7 @@ Designed by Marcell Ban aka BxNxM
 #                           IMPORTS                             #
 #################################################################
 from os import remove
+from re import search
 from json import load, dump
 from utime import sleep
 from Debug import DebugCfg, console_write, errlog_add
@@ -185,6 +186,21 @@ class Data:
             # Return default value if key not exists
             return 'n/a'
 
+    @staticmethod
+    def validate_pwd(password):
+        """
+        Validate appwd parameter
+        - webrepl password
+        - micrOS auth password (Shell/WebCli)
+        - wifi access point password
+        """
+        # Check password rules
+        if 4 <= len(password) <= 9:
+            if search(r"[A-Z]", password) and search(r"[a-z]", password):
+                if search(r"\d", password):
+                    return True, ''
+        return False, 'Password must include [0-9] both [a-z][A-Z] and length between 4-9 char.'
+
 
 #################################################################
 #                  CONFIGHANDLER  FUNCTIONS                     #
@@ -204,8 +220,11 @@ def cfgget(key=None):
         errlog_add(f'[ERR] cfgget {key} error: {e}')
     return None
 
-
 def cfgput(key, value, type_check=False):
+    if key == 'appwd':
+        is_valid, verdict = Data.validate_pwd(value)
+        if not is_valid:
+            raise Exception(verdict)
     # Handle special "offloaded" keys
     if str(Data.CONFIG_CACHE.get(key, None)) == '...':
         return Data.disk_keys(key, value)

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/Hooks.py

@@ -19,13 +19,17 @@ Designed by Marcell Ban aka BxNxM
 #################################################################
 from Config import cfgget, cfgput
 from microIO import detect_platform
-from Debug import console_write
+from Debug import console_write, errlog_add
 from Tasks import exec_lm_pipe
 from micropython import mem_info
 from machine import freq
+try:
+    from machine import reset_cause, PWRON_RESET, HARD_RESET, WDT_RESET, DEEPSLEEP_RESET, SOFT_RESET
+except ImportError:
+    reset_cause = None
 try:
     from gc import mem_free
-except:
+except ImportError:
     from simgc import mem_free
 
 #################################################################
@@ -38,9 +42,9 @@ def bootup():
     Executes when system boots up.
     """
     # Execute LMs from boothook config parameter
-    console_write("[BOOT] EXECUTION ...")
+    console_write("[BOOT] EXECUTION...")
+    boot_cause()
     bootasks = cfgget('boothook')
-    bootasks = _migrate(bootasks)                # load_n_init -> load migration (simplify)
     if bootasks is not None and bootasks.lower() != 'n/a':
         console_write(f"|-[BOOT] TASKS: {bootasks}")
         if exec_lm_pipe(bootasks):
@@ -89,15 +93,21 @@ def profiling_info(label=""):
         mem_info()
         console_write("~"*30)
 
-def _migrate(bootstr):
-    """
-    OBSOLETE load_n_init -- REMOVE AT 2023.12
-    Use load instead
-    - auto replace in boothook param
-    """
-    if 'load_n_init' in bootstr:
-        console_write("[MIGRATE] load_n_init -> load")
-        bootstr = bootstr.replace('load_n_init', 'load')
-        cfgput('boothook', bootstr)
-    return bootstr
 
+def boot_cause():
+    reason = 0, "-Unknown"
+    if callable(reset_cause):
+        reason = 0, "Unknown"
+        reset_reason = reset_cause()
+        if reset_reason == PWRON_RESET:
+            reason = 1, "PowerOn"
+        elif reset_reason == HARD_RESET:
+            reason = 2, "HardReset"
+        elif reset_reason == WDT_RESET:
+            reason = 3, "WDTWakeUp"
+        elif reset_reason == DEEPSLEEP_RESET:
+            reason = 4, "DSWakeUp"
+        elif reset_reason == SOFT_RESET:
+            reason = 5, "SoftReset"
+    errlog_add(f"[BOOT] info: {reason[1]}")
+    return reason

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/LM_buzzer.py

@@ -1,8 +1,7 @@
 from sys import platform
 from utime import sleep
 from microIO import resolve_pin, pinmap_search
-from Common import micro_task
-import uasyncio as asyncio
+from Common import micro_task, notify
 from Types import resolve
 
 
@@ -14,6 +13,7 @@ __BUZZER_OBJ = None
 __BUZZER_CACHE = [600]
 __PERSISTENT_CACHE = False
 __TASK_TAG = "buzzer._play"
+CHECK_NOTIFY = False
 
 #########################################
 #              BUZZER RTTL              #
@@ -230,7 +230,9 @@ def bipp(repeat=1, freq=None):
     :param freq int: 0-1000 default: 600
     :return str: Verdict string
     """
-    global __BUZZER_CACHE
+    global __BUZZER_CACHE, CHECK_NOTIFY
+    if CHECK_NOTIFY and not notify():
+        return "NoBipp - notify off"
     # restore data from cache if it was not provided
     freq = int(__BUZZER_CACHE[0] if freq is None else freq)
     for _ in range(repeat):
@@ -254,7 +256,7 @@ async def _play(rtttlstr):
         task.out = "Play song..."
         for freq, msec in tune.notes():
             __play_tone(freq, msec)
-            await asyncio.sleep_ms(10)
+            await task.feed(sleep_ms=10)
         task.out = "Song played successfully"
     del tune
 
@@ -265,6 +267,9 @@ def play(rtttlstr='Indiana'):
     :param rtttlstr str: rttl string, default: 'd=4,o=5,b=250:e,8p,8f,8g,8p,1c6,8p.,d,8p,8e,1f,p.'
     :return str: verdict
     """
+    global CHECK_NOTIFY
+    if CHECK_NOTIFY and not notify():
+        return "NoBipp - notify off"
     state = micro_task(tag=__TASK_TAG, task=_play(rtttlstr))
     if state:
         return 'Play song'
@@ -278,22 +283,24 @@ def list_tones():
     return '\n'.join(list(_builtin_tones()))
 
 
-def load(cache=None):
+def load(cache=None, check_notify=False):
     """
     Initialize buzzer module
     :param cache bool: file state machine cache: True/False/None(default: automatic True)
     - Load .pds (state machine cache) for this load module
     - Apply loaded states to gpio pins (boot function)
-    :return str: Cache state
+    :param check_notify: check notify enabled/disabled - make noise if enabled only
+    :return str: Verdict
     """
     from sys import platform
-    global __PERSISTENT_CACHE
+    global __PERSISTENT_CACHE, CHECK_NOTIFY
     if cache is None:
         __PERSISTENT_CACHE = False if platform == 'esp8266' else True
     else:
         __PERSISTENT_CACHE = cache
     __persistent_cache_manager('r')
-    return "CACHE: {}".format(__PERSISTENT_CACHE)
+    CHECK_NOTIFY = check_notify
+    return f"CACHE: {__PERSISTENT_CACHE}, check notify: {CHECK_NOTIFY}"
 
 
 #######################
@@ -320,4 +327,4 @@ def help(widgets=False):
     return resolve(('BUTTON bipp repeat=3 freq=600',
                              'BUTTON play rtttlstr=<Indiana,TakeOnMe,StarWars,MissionImp>',
                              'list_tones',
-                             'load', 'pinmap'), widgets=widgets)
+                             'load check_notify=False', 'pinmap'), widgets=widgets)

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/LM_cct.py

@@ -5,7 +5,6 @@ from machine import Pin, PWM
 from sys import platform
 from utime import sleep_ms
 from Common import transition_gen, micro_task
-import uasyncio as asyncio
 from microIO import resolve_pin, pinmap_search
 from random import randint
 from Types import resolve
@@ -229,7 +228,7 @@ def transition(cw=None, ww=None, sec=1.0, wake=False):
                 Data.CWWW_CACHE[0] = cw_val if cw_val > 5 else 5   # SAVE VALUE TO CACHE > 5 ! because toggle
                 Data.CWWW_CACHE[1] = ww_val if ww_val > 5 else 5   # SAVE VALUE TO CACHE > 5 ! because toggle
                 my_task.out = f"Dimming: CW:{cw_val} WW:{ww_val}"
-                await asyncio.sleep_ms(ms_period)
+                await my_task.feed(sleep_ms=ms_period)
             if Data.CWWW_CACHE[2] == 1 or wake:
                 __state_machine(c=cw_val, w=ww_val)
             my_task.out = f"Dimming DONE: CW:{cw_val} WW:{ww_val}"
@@ -278,7 +277,7 @@ def hue_transition(percent, sec=1.0, wake=False):
                 Data.CWWW_CACHE[1] = warm if warm > 5 else 5
                 my_task.out = f"HUE {int(hue_precent*0.1)}%w - CW:{cold} WW:{warm}"
                 # Feed async loop
-                await asyncio.sleep_ms(ms_period)
+                await my_task.feed(sleep_ms=ms_period)
             __state_machine(cold, warm)
             my_task.out = f"HUE DONE {int(hue_precent*0.001)}%w - CW:{cold} WW:{warm}"
 

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/LM_dimmer.py

@@ -1,7 +1,6 @@
 from sys import platform
 from microIO import resolve_pin, pinmap_search
 from Common import transition_gen, micro_task
-import uasyncio as asyncio
 from utime import sleep_ms
 from Types import resolve
 
@@ -171,7 +170,7 @@ def transition(value, sec=1.0, wake=False):
                 # Update periphery cache (value check due to toggle ON value minimum)
                 Data.DIMMER_CACHE[1] = i if i > 5 else 5   # SAVE VALUE TO CACHE > 5 ! because toggle
                 my_task.out = f"Dimming: {i}"
-                await asyncio.sleep_ms(ms_period)
+                await my_task.feed(sleep_ms=ms_period)
             if Data.DIMMER_CACHE[0] == 1 or wake:
                 __state_machine(i)
             my_task.out = f"Dimming DONE: {i}"

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/LM_distance.py

@@ -1,7 +1,6 @@
 from machine import Pin, time_pulse_us
 from utime import sleep_us
 from microIO import resolve_pin, pinmap_search
-import uasyncio as asyncio
 from Common import micro_task
 from Types import resolve
 
@@ -50,7 +49,7 @@ async def __task(period_ms, dimmer, idle_cm):
             brightness_min_cm = 5
             dist = int(measure_cm()["cm"])
             if dist > idle_cm+100:
-                await asyncio.sleep_ms(50)
+                await my_task.feed(sleep_ms=50)
                 continue
             dist = brightness_max_cm if dist > brightness_max_cm else dist   # Limit max
             dist = 0 if dist < brightness_min_cm else dist                   # Limit min
@@ -63,9 +62,8 @@ async def __task(period_ms, dimmer, idle_cm):
 
             # Store data in task cache (task show mytask)
             my_task.out = f'Dist: {dist} br: {brightness}'
-
             # Async sleep - feed event loop
-            await asyncio.sleep_ms(period_ms)
+            await my_task.feed(sleep_ms=period_ms)
 
 
 def start_dimmer_indicator(idle_distance=180):

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/LM_genIO.py

@@ -124,7 +124,7 @@ def get_adc(pin, key=None):
     if isinstance(pin, int):
         pin_tag = f"ADC{pin}"
         pin = register_pin(pin_tag, pin)
-    data = SmartADC.get_singleton(pin).get()
+    data = SmartADC.get_instance(pin).get()
     data["pin"] = pin
     if key is None:
         return data

{microsdevtoolkit-2.8.6 → microsdevtoolkit-2.9.0}/micrOS/source/LM_i2s_mic.py

@@ -49,7 +49,7 @@ async def __control_task(ms_period=50):
     querying samples. Pushing the button again reinitializes the
     microphone without having to restart dependent load modules.
     """
-    with micro_task(tag=Data.CONTROL_TASK_TAG):
+    with micro_task(tag=Data.CONTROL_TASK_TAG) as my_task:
         while True:
             if Data.CONTROL_BUTTON_PIN.value():
                 Data.MIC_ENABLED = not Data.MIC_ENABLED
@@ -59,8 +59,8 @@ async def __control_task(ms_period=50):
                     load()
 
                 # Debounce
-                await asyncio.sleep_ms(500)
-            await asyncio.sleep_ms(ms_period)
+                await my_task.feed(sleep_ms=500)
+            await my_task.feed(sleep_ms=ms_period)
 
 
 ###########################
@@ -76,7 +76,7 @@ async def __task(ms_period):
             recording_task.out = 'Capturing'
             while Data.MIC_ENABLED:
                 await Data.SREADER.readinto(sample_mv)
-                await asyncio.sleep_ms(ms_period)
+                await recording_task.feed(sleep_ms=ms_period)
             recording_task.out = 'Finished'
 
         except Exception as e: