micrOSDevToolKit 2.1.5__py3-none-any.whl → 2.26.1__py3-none-any.whl

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

@@ -1,5 +1,5 @@
 from machine import I2C, Pin
-from microIO import physical_pin, pinmap_dump
+from microIO import bind_pin, pinmap_search
 from Common import syslog
 from time import sleep
 from binascii import hexlify
@@ -24,7 +24,7 @@ def _handle_connection_error(f):
 
 class AHT10:
     def __init__(self, address = 0x38):
-        self.i2c = I2C(-1, Pin(physical_pin('i2c_scl')), Pin(physical_pin('i2c_sda')), freq = 9600)
+        self.i2c = I2C(-1, Pin(bind_pin('i2c_scl')), Pin(bind_pin('i2c_sda')), freq = 9600)
         self.address = address
         if not self.init_sensor():
             raise Exception("Could not initialize the sensor!")
@@ -84,6 +84,14 @@ class AHT10:
         return self._send_sensor(b'\xBA')
 
 
+def load():
+    """
+    Initialize AHT10 module
+    """
+    __init_AHT10()
+    return "AHT10 temp/hum sensor - loaded"
+
+
 def __init_AHT10():
     global __AHT10_OBJ
     if __AHT10_OBJ is None:
@@ -118,7 +126,7 @@ def pinmap():
     - info which pins to use for this application
     :return dict: pin name (str) - pin value (int) pairs
     """
-    return pinmap_dump(['i2c_scl', 'i2c_sda'])
+    return pinmap_search(['i2c_scl', 'i2c_sda'])
 
 
 def help(widgets=False):
@@ -128,4 +136,4 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('pinmap', 'TEXTBOX measure', 'reset'), widgets=widgets)
+    return resolve(('TEXTBOX measure', 'reset', 'load', 'pinmap'), widgets=widgets)

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

@@ -6,7 +6,7 @@ https://randomnerdtutorials.com/micropython-bme280-esp32-esp8266/
 
 import utime as time
 from machine import Pin, I2C
-from microIO import physical_pin, pinmap_dump
+from microIO import bind_pin, pinmap_search
 from Common import notify
 from Types import resolve
 
@@ -299,7 +299,7 @@ class BME280:
 def __init_bme280_i2c():
     global BME280_OBJ
     if BME280_OBJ is None:
-        i2c = I2C(scl=Pin(physical_pin('i2c_scl')), sda=Pin(physical_pin('i2c_sda')), freq=10000)
+        i2c = I2C(scl=Pin(bind_pin('i2c_scl')), sda=Pin(bind_pin('i2c_sda')), freq=10000)
         BME280_OBJ = BME280(i2c=i2c)
     return BME280_OBJ
 
@@ -308,6 +308,14 @@ def __init_bme280_i2c():
 # Application functions #
 #########################
 
+def load():
+    """
+    Initialize BME280 module
+    """
+    __init_bme280_i2c()
+    return "BME280 temp/hum/pressure sensor - loaded"
+
+
 def measure(ntfy=False):
     """
     Measure with bme280
@@ -320,30 +328,10 @@ def measure(ntfy=False):
     return data
 
 
-def measure_w_co2():
-    """
-    Measure with bme280 and mq135 (CO2)
-    :return dict: temp, hum, pressure, co2
-    """
-    from LM_co2 import measure_mq135
-    data = measure()
-    data['co2[ppm]'] = measure_mq135(data['temp[C]'], data['hum[%]'])
-    return data
-
-
 #######################
 # LM helper functions #
 #######################
 
-def lmdep():
-    """
-    Show Load Module dependency
-    - List of load modules used by this application
-    :return: tuple
-    """
-    return 'co2'
-
-
 def pinmap():
     """
     [i] micrOS LM naming convention
@@ -351,7 +339,7 @@ def pinmap():
     - info which pins to use for this application
     :return dict: pin name (str) - pin value (int) pairs
     """
-    return pinmap_dump(['i2c_scl', 'i2c_sda'])
+    return pinmap_search(['i2c_scl', 'i2c_sda'])
 
 
 def help(widgets=False):
@@ -361,5 +349,5 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return resolve(('TEXTBOX measure ntfy=False', 'measure_w_co2',
-                             'lmdep', 'pinmap'), widgets=widgets)
+    return resolve(('TEXTBOX{"refresh": 2000} measure ntfy=False',
+                             'load', 'pinmap'), widgets=widgets)

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

@@ -1,8 +1,7 @@
-from sys import platform
 from utime import sleep
-from microIO import physical_pin, pinmap_dump
-from Common import micro_task
-import uasyncio as asyncio
+from microIO import bind_pin, pinmap_search
+from Common import micro_task, notify, data_dir
+from Types import resolve
 
 
 #########################################
@@ -13,12 +12,14 @@ __BUZZER_OBJ = None
 __BUZZER_CACHE = [600]
 __PERSISTENT_CACHE = False
 __TASK_TAG = "buzzer._play"
+__FILE_CACHE = data_dir('buzzer.cache')
+CHECK_NOTIFY = False
 
 #########################################
 #              BUZZER RTTL              #
 #########################################
 
-NOTE = [
+NOTE = (
     440.0,  # A
     493.9,  # B or H
     261.6,  # C
@@ -35,8 +36,8 @@ NOTE = [
     0.0,
     370.0,  # F#
     415.3,  # G#
-    0.0,
-]
+    0.0
+)
 
 
 # Ring Tone Transfer Language
@@ -142,7 +143,6 @@ class RTTTL:
 
 def _builtin_tones(tone=None):
     tones = (
-        ("TheSimpsons", "d=4,o=5,b=160:c.6,e6,f#6,8a6,g.6,e6,c6,8a,8f#,8f#,8f#,2g,8p,8p,8f#,8f#,8f#,8g,a#.,8c6,8c6,8c6,c6"),
         ("Indiana", "d=4,o=5,b=250:e,8p,8f,8g,8p,1c6,8p.,d,8p,8e,1f,p.,g,8p,8a,8b,8p,1f6,p,a,8p,8b,2c6,2d6,2e6,e,8p,8f,8g,8p,1c6,p,d6,8p,8e6,1f.6,g,8p,8g,e.6,8p,d6,8p,8g,e.6,8p,d6,8p,8g,f.6,8p,e6,8p,8d6,2c6"),
         ("TakeOnMe", "d=4,o=4,b=160:8f#5,8f#5,8f#5,8d5,8p,8b,8p,8e5,8p,8e5,8p,8e5,8g#5,8g#5,8a5,8b5,8a5,8a5,8a5,8e5,8p,8d5,8p,8f#5,8p,8f#5,8p,8f#5,8e5,8e5,8f#5,8e5,8f#5,8f#5,8f#5,8d5,8p,8b,8p,8e5,8p,8e5,8p,8e5,8g#5,8g#5,8a5,8b5,8a5,8a5,8a5,8e5,8p,8d5,8p,8f#5,8p,8f#5,8p,8f#5,8e5,8e5"),
         ("Entertainer", "d=4,o=5,b=140:8d,8d#,8e,c6,8e,c6,8e,2c.6,8c6,8d6,8d#6,8e6,8c6,8d6,e6,8b,d6,2c6,p,8d,8d#,8e,c6,8e,c6,8e,2c.6,8p,8a,8g,8f#,8a,8c6,e6,8d6,8c6,8a,2d6"),
@@ -155,7 +155,6 @@ def _builtin_tones(tone=None):
         ("Smurfs", "d=32,o=5,b=200:4c#6,16p,4f#6,p,16c#6,p,8d#6,p,8b,p,4g#,16p,4c#6,p,16a#,p,8f#,p,8a#,p,4g#,4p,g#,p,a#,p,b,p,c6,p,4c#6,16p,4f#6,p,16c#6,p,8d#6,p,8b,p,4g#,16p,4c#6,p,16a#,p,8b,p,8f,p,4f#"),
         ("MissionImp", "d=16,o=6,b=95:32d,32d#,32d,32d#,32d,32d#,32d,32d#,32d,32d,32d#,32e,32f,32f#,32g,g,8p,g,8p,a#,p,c7,p,g,8p,g,8p,f,p,f#,p,g,8p,g,8p,a#,p,c7,p,g,8p,g,8p,f,p,f#,p,a#,g,2d,32p,a#,g,2c#,32p,a#,g,2c,a#5,8c,2p,32p,a#5,g5,2f#,32p,a#5,g5,2f,32p,a#5,g5,2e,d#,8d"),
         ("smbdeath", "d=4,o=5,b=90:32c6,32c6,32c6,8p,16b,16f6,16p,16f6,16f.6,16e.6,16d6,16c6,16p,16e,16p,16c"),
-        ("MontyP", "d=4,o=5,b=200:f6,8e6,d6,8c#6,c6,8b,a#,8a,8g,8a,8a#,a,8g,2c6,8p,8c6,8a,8p,8a,8a,8g#,8a,8f6,8p,8c6,8c6,8p,8a,8a#,8p,8a#,8a#,8p,8c6,2d6,8p,8a#,8g,8p,8g,8g,8f#,8g,8e6,8p,8d6,8d6,8p,8a#,8a,8p,8a,8a,8p,8a#,2c6,8p,8c6"),
         ("BarbieGirl", "d=4,o=5,b=125:8g#,8e,8g#,8c#6,a,p,8f#,8d#,8f#,8b,g#,8f#,8e,p,8e,8c#,f#,c#,p,8f#,8e,g#,f#"),
         ("TakeOnMe", "d=4,o=4,b=160:8f#5,8f#5,8f#5,8d5,8p,8b,8p,8e5,8p,8e5,8p,8e5,8g#5,8g#5,8a5,8b5,8a5,8a5,8a5,8e5,8p,8d5,8p,8f#5,8p,8f#5,8p,8f#5,8e5,8e5,8f#5,8e5,8f#5,8f#5,8f#5,8d5,8p,8b,8p,8e5,8p,8e5,8p,8e5,8g#5,8g#5,8a5,8b5,8a5,8a5,8a5,8e5,8p,8d5,8p,8f#5,8p,8f#5,8p,8f#5,8e5,8e5")
     )
@@ -176,22 +175,22 @@ def _builtin_tones(tone=None):
 #########################################
 
 
-def __buzzer_init():
+def __buzzer_init(pin=None):
+    """
+    :param pin: optional number to overwrite default pin
+    """
     global __BUZZER_OBJ
     if __BUZZER_OBJ is None:
         from machine import Pin, PWM
-        dimmer_pin = Pin(physical_pin('buzzer'))
-        if platform == 'esp8266':
-            __BUZZER_OBJ = PWM(dimmer_pin, freq=600)
-        else:
-            __BUZZER_OBJ = PWM(dimmer_pin, freq=600)
+        dimmer_pin = Pin(bind_pin('buzzer', number=pin))
+        __BUZZER_OBJ = PWM(dimmer_pin, freq=600)
         __BUZZER_OBJ.duty(512)      # 50%
     return __BUZZER_OBJ
 
 
 def __persistent_cache_manager(mode='r'):
     """
-    pds - persistent data structure
+    File cache
     modes:
         r - recover, s - save
     """
@@ -200,12 +199,12 @@ def __persistent_cache_manager(mode='r'):
     global __BUZZER_CACHE
     if mode == 's':
         # SAVE CACHE
-        with open('buzzer.pds', 'w') as f:
+        with open(__FILE_CACHE, 'w') as f:
             f.write(','.join([str(k) for k in __BUZZER_CACHE]))
         return
     try:
         # RESTORE CACHE
-        with open('buzzer.pds', 'r') as f:
+        with open(__FILE_CACHE, 'r') as f:
             __BUZZER_CACHE = [int(data) for data in f.read().strip().split(',')]
     except:
         pass
@@ -231,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):
@@ -245,7 +246,7 @@ def bipp(repeat=1, freq=None):
 async def _play(rtttlstr):
     """
     RTTTL Piezzo Player with async job
-    :param rtttlstr str: rttl string, default: 'd=4,o=5,b=250:e,8p,8f,8g,8p,1c6,8p.,d,8p,8e,1f,p.'
+    :param rtttlstr str: rttl string
     :return str: verdict
     """
     # https://github.com/dhylands/upy-rtttl/blob/master/songs.py
@@ -255,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(40)
+            await task.feed(sleep_ms=10)
         task.out = "Song played successfully"
     del tune
 
@@ -266,10 +267,10 @@ 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
     """
-    state = micro_task(tag=__TASK_TAG, task=_play(rtttlstr))
-    if state:
-        return 'Play song'
-    return 'Song already playing'
+    global CHECK_NOTIFY
+    if CHECK_NOTIFY and not notify():
+        return "NoBipp - notify off"
+    return micro_task(tag=__TASK_TAG, task=_play(rtttlstr))
 
 
 def list_tones():
@@ -279,22 +280,20 @@ def list_tones():
     return '\n'.join(list(_builtin_tones()))
 
 
-def load_n_init(cache=None):
+def load(check_notify=False, pin=None, cache=True):
     """
-    Initiate 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
+    Initialize buzzer module
+    :param check_notify: check notify enabled/disabled - make noise if enabled only
+    :param pin: optional number to overwrite default pin
+    :param cache: default True, store stages on disk (.cache)
+    :return str: Verdict
     """
-    from sys import platform
-    global __PERSISTENT_CACHE
-    if cache is None:
-        __PERSISTENT_CACHE = False if platform == 'esp8266' else True
-    else:
-        __PERSISTENT_CACHE = cache
+    global __PERSISTENT_CACHE, CHECK_NOTIFY
+    __PERSISTENT_CACHE = cache
     __persistent_cache_manager('r')
-    return "CACHE: {}".format(__PERSISTENT_CACHE)
+    CHECK_NOTIFY = check_notify
+    __buzzer_init(pin=pin)
+    return f"CACHE: {__PERSISTENT_CACHE}, check notify: {CHECK_NOTIFY}"
 
 
 #######################
@@ -308,7 +307,7 @@ def pinmap():
     - info which pins to use for this application
     :return dict: pin name (str) - pin value (int) pairs
     """
-    return pinmap_dump('buzzer')
+    return pinmap_search('buzzer')
 
 
 def help(widgets=False):
@@ -318,4 +317,7 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'bipp repeat=<int> freq=<Hz>', 'play <rtttlstr/title>', 'list_tones', 'load_n_init', 'pinmap'
+    return resolve(('BUTTON bipp repeat=3 freq=600',
+                             'BUTTON play rtttlstr=<Indiana,TakeOnMe,StarWars,MissionImp>',
+                             'list_tones',
+                             'load check_notify=False', 'pinmap'), widgets=widgets)

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

@@ -4,9 +4,8 @@
 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 physical_pin, pinmap_dump
+from Common import transition_gen, micro_task, data_dir
+from microIO import bind_pin, pinmap_search
 from random import randint
 from Types import resolve
 
@@ -19,16 +18,17 @@ class Data:
     CCT_TASK_TAG = 'cct._tran'
     HUE_TASK_TAG = 'cct._hue'
     TASK_STATE = False
+    FILE_CACHE = data_dir('cwww.cache')
 
 
 #########################################
 #      ANALOG CCT WITH 2 channel PWM    #
 #########################################
 
-def __cwww_init():
+def __cwww_init(pin_warm=None, pin_cold=None):
     if Data.CWWW_OBJS[0] is None or Data.CWWW_OBJS[1] is None:
-        cw = Pin(physical_pin('cwhite'))
-        ww = Pin(physical_pin('wwhite'))
+        cw = Pin(bind_pin('cwhite', pin_cold))
+        ww = Pin(bind_pin('wwhite', pin_warm))
         if platform == 'esp8266':
             Data.CWWW_OBJS = (PWM(cw, freq=1024),
                               PWM(ww, freq=1024))
@@ -40,7 +40,7 @@ def __cwww_init():
 
 def __persistent_cache_manager(mode):
     """
-    pds - persistent data structure
+    File state cache
     modes:
         r - recover, s - save
     """
@@ -48,12 +48,12 @@ def __persistent_cache_manager(mode):
         return
     if mode == 's':
         # SAVE CACHE
-        with open('cwww.pds', 'w') as f:
+        with open(Data.FILE_CACHE, 'w') as f:
             f.write(','.join([str(k) for k in Data.CWWW_CACHE]))
         return
     try:
         # RESTORE CACHE
-        with open('cwww.pds', 'r') as f:
+        with open(Data.FILE_CACHE, 'r') as f:
             Data.CWWW_CACHE = [float(data) for data in f.read().strip().split(',')]
     except:
         pass
@@ -73,19 +73,16 @@ def __state_machine(c, w):
 # Application functions #
 #########################
 
-def load_n_init(cache=None):
+def load(pin_warm=None, pin_cold=None, cache=True):
     """
-    Initiate Cold white / Warm white LED 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)
+    Initialize Cold white / Warm white LED module
+    :param pin_warm: optional number to overwrite default pin
+    :param pin_cold: optional number to overwrite default pin
+    :param cache: save/load state machine to disk (.cache)
     :return str: Cache state
     """
-    from sys import platform
-    if cache is None:
-        Data.PERSISTENT_CACHE = False if platform == 'esp8266' else True
-    else:
-        Data.PERSISTENT_CACHE = cache
+    __cwww_init(pin_warm, pin_cold)
+    Data.PERSISTENT_CACHE = cache
     __persistent_cache_manager('r')        # recover data cache
     if Data.CWWW_CACHE[2] == 1:
         Data.CWWW_CACHE[2] = 0             # Force ON at boot
@@ -229,7 +226,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}"
@@ -241,8 +238,7 @@ def transition(cw=None, ww=None, sec=1.0, wake=False):
     # Create transition generator and calculate step_ms
     cct_gen, step_ms = transition_gen(cw_from, cw_to, ww_from, ww_to, interval_sec=sec)
     # [!] ASYNC TASK CREATION [1*] with async task callback + taskID (TAG) handling
-    state = micro_task(tag=Data.CCT_TASK_TAG, task=_task(ms_period=step_ms, iterable=cct_gen))
-    return "Starting transition" if state else "Transition already running"
+    return micro_task(tag=Data.CCT_TASK_TAG, task=_task(ms_period=step_ms, iterable=cct_gen))
 
 
 def hue_transition(percent, sec=1.0, wake=False):
@@ -278,7 +274,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}"
 
@@ -291,8 +287,7 @@ def hue_transition(percent, sec=1.0, wake=False):
         #print("Actual percent: {}, target percent: {}".format(actual_percent, warm_percent))
         hue_gen, step_ms = transition_gen(hue_curr_percent, percent*10, interval_sec=sec)
         # [!] ASYNC TASK CREATION [1*] with async task callback + taskID (TAG) handling
-        state = micro_task(tag=Data.HUE_TASK_TAG, task=_task(ms_period=step_ms, iterable=hue_gen))
-        return "Starting transition" if state else "Transition already running"
+        return micro_task(tag=Data.HUE_TASK_TAG, task=_task(ms_period=step_ms, iterable=hue_gen))
     else:
         return "Invalid range, percent=<0-100>"
 
@@ -341,7 +336,7 @@ def pinmap():
     - info which pins to use for this application
     :return dict: pin name (str) - pin value (int) pairs
     """
-    return pinmap_dump(['cwhite', 'wwhite'])
+    return pinmap_search(['cwhite', 'wwhite'])
 
 
 def help(widgets=False):
@@ -352,7 +347,7 @@ def help(widgets=False):
         (widgets=True) list of widget json for UI generation
     """
     return resolve(('WHITE white cw=<0-1000-5> ww smooth=True force=True',
-                             'TOGGLE toggle state=None smooth=True', 'load_n_init',
+                             'BUTTON toggle state=<True,False> smooth=True', 'load',
                              'SLIDER brightness percent=<0-100> smooth=True wake=True',
                              'transition cw=None ww=None sec=1.0 wake=False',
                              'hue_transition percent=<0-100> sec=1.0 wake=False',