micrOSDevToolKit 2.9.7__py3-none-any.whl → 2.9.8__py3-none-any.whl

micrOS/source/LM_genIO.py

@@ -1,5 +1,5 @@
 from machine import Pin, PWM
-from microIO import resolve_pin, register_pin, PinMap
+from microIO import bind_pin, PinMap
 from Common import SmartADC
 from random import randint
 
@@ -10,15 +10,25 @@ from random import randint
 
 class IObjects:
     PIN_OBJS = {}
+    DENY_TAG_INPUT = True
 
     @staticmethod
-    def store_obj(pin, obj):
+    def store_obj(pin:int, obj:object) -> None:
         IObjects.PIN_OBJS[pin] = obj
 
     @staticmethod
-    def get_obj(pin):
+    def get_obj(pin:int) -> object:
         return IObjects.PIN_OBJS[pin]
 
+    @staticmethod
+    def is_unassigned(pin_number):
+        return IObjects.PIN_OBJS.get(pin_number, None) is None
+
+    @staticmethod
+    def protect_builtins(pin_num, tag):
+        if pin_num is None and IObjects.DENY_TAG_INPUT:
+            raise Exception(f"pin must be integer not {type(tag)}: {tag}")
+
 
 ##################################
 #     INTERNAL INIT FUNCTIONS    #
@@ -28,48 +38,39 @@ def __digital_out_init(pin):
     """
     Init Digital output
     """
-    if not isinstance(pin, int):
-        pin = resolve_pin(pin)
-
-    # Register pin in microIO (drops exception if pin already booked)
-    pin_tag = f"OUT{pin}"
-    if PinMap.IO_USE_DICT.get(pin_tag, None) is None:
-        pin = register_pin(pin_tag, pin)
-        pin_obj = Pin(pin, Pin.OUT)
-        IObjects.store_obj(pin, pin_obj)
-    return IObjects.get_obj(pin)
+    pin_tag, pin = (pin, None) if isinstance(pin, str) else (f"OUT{pin}", pin)
+    IObjects.protect_builtins(pin, pin_tag)
+    pin_num = bind_pin(pin_tag, pin)
+    if IObjects.is_unassigned(pin_number=pin_num):
+        pin_obj = Pin(pin_num, Pin.OUT)
+        IObjects.store_obj(pin_num, pin_obj)
+    return IObjects.get_obj(pin_num)
 
 
 def __digital_in_init(pin):
     """
     Init Digital output
     """
-    if not isinstance(pin, int):
-        pin = resolve_pin(pin)
-
-    # Register pin in microIO (drops exception if pin already booked)
-    pin_tag = f"IN{pin}"
-    if PinMap.IO_USE_DICT.get(pin_tag, None) is None:
-        pin = register_pin(pin_tag, pin)
-        pin_obj = Pin(pin, Pin.IN, Pin.PULL_UP)
-        IObjects.store_obj(pin, pin_obj)
-    return IObjects.get_obj(pin)
+    pin_tag, pin = (pin, None) if isinstance(pin, str) else (f"IN{pin}", pin)
+    IObjects.protect_builtins(pin, pin_tag)
+    pin_num = bind_pin(pin_tag, pin)
+    if IObjects.is_unassigned(pin_number=pin_num):
+        pin_obj = Pin(pin_num, Pin.IN, Pin.PULL_UP)
+        IObjects.store_obj(pin_num, pin_obj)
+    return IObjects.get_obj(pin_num)
 
 
 def __pwm_init(pin, freq):
     """
     Init PWM signal
     """
-    if not isinstance(pin, int):
-        pin = resolve_pin(pin)
-
-    # Register pin in microIO (drops exception if pin already booked)
-    pin_tag = f"PWM{pin}"
-    if PinMap.IO_USE_DICT.get(pin_tag, None) is None:
-        pin = register_pin(pin_tag, pin)
-        pin_obj = PWM(Pin(pin), freq=freq)
-        IObjects.store_obj(pin, pin_obj)
-    return IObjects.get_obj(pin)
+    pin_tag, pin = (pin, None) if isinstance(pin, str) else (f"PWM{pin}", pin)
+    IObjects.protect_builtins(pin, pin_tag)
+    pin_num = bind_pin(pin_tag, pin)
+    if IObjects.is_unassigned(pin_number=pin_num):
+        pin_obj = PWM(Pin(pin_num), freq=freq)
+        IObjects.store_obj(pin_num, pin_obj)
+    return IObjects.get_obj(pin_num)
 
 
 ##################################
@@ -121,9 +122,9 @@ def get_adc(pin, key=None):
     :param key: select adc parameter by key
     :return dict: adc volt, percent, raw
     """
-    if isinstance(pin, int):
-        pin_tag = f"ADC{pin}"
-        pin = register_pin(pin_tag, pin)
+    pin_tag, pin = (pin, None) if isinstance(pin, str) else (f"ADC{pin}", pin)
+    IObjects.protect_builtins(pin, pin_tag)
+    pin = bind_pin(pin_tag, pin)
     data = SmartADC.get_instance(pin).get()
     data["pin"] = pin
     if key is None:
@@ -140,6 +141,19 @@ def get_in(pin):
     return {'pin': pin, 'state': __digital_in_init(pin).value()}
 
 
+def load(allow_tags=False):
+    """
+    Optional load function to set
+    tag input besides pin numbers.
+    [WARNING] allow_tag=True can be dangerous
+    - it can overwrite existing I/O based on
+    the provided tag
+    :param allow_tag: default False
+    """
+    IObjects.DENY_TAG_INPUT = not allow_tags
+    return "[WARNING] allow_tag=True can be dangerous, use it consciously!!!" if allow_tags else "Loaded"
+
+
 #######################
 # LM helper functions #
 #######################
@@ -155,4 +169,5 @@ def help(widgets=False):
            'set_random_pwm pin min_duty max_duty freq=20480)',\
            'set_out pin=<int> state=<None/True/False>',\
            'get_adc pin key=None',\
-           'get_in pin'
+           'get_in pin',\
+           'load allow_tags=False'

micrOS/source/LM_haptic.py

@@ -1,4 +1,4 @@
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Types import resolve
 from machine import Pin, PWM
 from utime import sleep_ms
@@ -18,7 +18,7 @@ def load(intensity=None):
     :param intensity: low / high / None haptic feedback intensity
     """
     if Haptic.HAPTIC_OBJ is None:
-        dimmer_pin = Pin(resolve_pin('haptic'))
+        dimmer_pin = Pin(bind_pin('haptic'))
         Haptic.HAPTIC_OBJ = PWM(dimmer_pin, freq=20480)
         Haptic.HAPTIC_OBJ.duty(0)
     if intensity in ("high", "low"):

micrOS/source/LM_i2c.py

@@ -1,4 +1,4 @@
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 
 __I2C = None
 
@@ -7,7 +7,7 @@ def __init():
     global __I2C
     if __I2C is None:
         from machine import Pin, I2C
-        __I2C = I2C(-1, Pin(resolve_pin('i2c_scl')), Pin(resolve_pin('i2c_sda')))
+        __I2C = I2C(-1, Pin(bind_pin('i2c_scl')), Pin(bind_pin('i2c_sda')))
     return __I2C
 
 

micrOS/source/LM_i2s_mic.py

@@ -1,14 +1,14 @@
 from ustruct import unpack
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Common import micro_task, web_endpoint, manage_task
 from machine import I2S, Pin
 import uasyncio as asyncio
 
 
 class Data:
-    SCK_PIN = Pin(resolve_pin('i2s_sck'))  # Serial clock
-    WS_PIN = Pin(resolve_pin('i2s_ws'))    # Word select
-    SD_PIN = Pin(resolve_pin('i2s_sd'))    # Serial data
+    SCK_PIN = Pin(bind_pin('i2s_sck'))  # Serial clock
+    WS_PIN = Pin(bind_pin('i2s_ws'))    # Word select
+    SD_PIN = Pin(bind_pin('i2s_sd'))    # Serial data
     I2S_CHANNEL = 1
     FORMAT = I2S.STEREO
     SAMPLING_RATE = 8000
@@ -276,7 +276,7 @@ def load(buf_length=Data.BUF_LENGTH, sampling_rate=Data.SAMPLING_RATE,
     
     if control_button:
         micro_task(tag=Data.CONTROL_TASK_TAG, task=__control_task())
-        Data.CONTROL_BUTTON_PIN = Pin(resolve_pin(control_button), Pin.IN)
+        Data.CONTROL_BUTTON_PIN = Pin(bind_pin(control_button), Pin.IN)
 
     Data.BUF_LENGTH = buf_length
     Data.SAMPLING_RATE = sampling_rate

micrOS/source/LM_keychain.py

@@ -2,7 +2,7 @@ from utime import localtime, sleep_ms
 from neopixel import NeoPixel
 from machine import Pin
 from Common import micro_task
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from LM_oled import text, show, rect, pixel, clean, line, load as oled_lni
 from LM_ds18 import measure
 from LM_system import top, ifconfig
@@ -234,7 +234,7 @@ def color_wheel(br=None):
     """
     def _init():
         if KC.NEOPIXEL_OBJ is None:
-            neopixel_pin = Pin(resolve_pin('neop'))        # Get Neopixel pin from LED PIN pool
+            neopixel_pin = Pin(bind_pin('neop'))        # Get Neopixel pin from LED PIN pool
             KC.NEOPIXEL_OBJ = NeoPixel(neopixel_pin, n=1)   # initialize for max 1 segment
         return KC.NEOPIXEL_OBJ
     # INIT

micrOS/source/LM_ld2410.py

@@ -17,9 +17,9 @@
 
 from machine import Pin, UART
 import utime
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 
-ser = UART(1, baudrate = 256000, tx=Pin(resolve_pin('tx')), rx=Pin(resolve_pin('rx')), timeout = 1)
+ser = UART(1, baudrate = 256000, tx=Pin(bind_pin('tx')), rx=Pin(bind_pin('rx')), timeout = 1)
 HEADER = bytes([0xfd, 0xfc, 0xfb, 0xfa])
 TERMINATOR = bytes([0x04, 0x03, 0x02, 0x01])
 NULLDATA = bytes([])

micrOS/source/LM_light_sensor.py

@@ -11,7 +11,7 @@ try:
     import LM_intercon as InterCon
 except:
     InterCon = None
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 
 
 ADC = None
@@ -23,7 +23,7 @@ def __init_tempt6000():
     """
     global ADC
     if ADC is None:
-        ADC = SmartADC(resolve_pin('temp6000'))
+        ADC = SmartADC(bind_pin('temp6000'))
     return ADC
 
 

micrOS/source/LM_neopixel.py

@@ -3,7 +3,7 @@ from machine import Pin
 from sys import platform
 from utime import sleep_ms
 from Common import transition_gen, micro_task
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from random import randint
 from Types import resolve
 
@@ -26,13 +26,13 @@ class Data:
 #########################################
 
 
-def __init_NEOPIXEL(n=24):
+def __init_NEOPIXEL(pin=None, n=24):
     """
     Init NeoPixel module
     n - number of led fragments
     """
     if Data.NEOPIXEL_OBJ is None:
-        neopixel_pin = Pin(resolve_pin('neop'))     # Get Neopixel pin from LED PIN pool
+        neopixel_pin = Pin(bind_pin('neop', number=pin))         # Get Neopixel pin from LED PIN pool
         Data.NEOPIXEL_OBJ = NeoPixel(neopixel_pin, n)                 # initialize for max 8 segments
         del neopixel_pin
     return Data.NEOPIXEL_OBJ
@@ -72,20 +72,17 @@ def __state_machine(r, g, b):
 #             USER FUNCTIONS            #
 #########################################
 
-def load(cache=None, ledcnt=24):
+def load(ledcnt=24, pin=None, cache=True):
     """
     Initiate NeoPixel RGB 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)
+    :param ledcnt: number of led segments
+    :param pin: optional number to overwrite default pin
+    :param cache: default True, store stages on disk +  Load (.pds)
     :return str: Cache state
     """
-    if cache is None:
-        Data.PERSISTENT_CACHE = False if platform == 'esp8266' else True
-    else:
-        Data.PERSISTENT_CACHE = cache
+    Data.PERSISTENT_CACHE = cache
     __persistent_cache_manager('r')         # recover data cache
-    _ledcnt = __init_NEOPIXEL(n=ledcnt).n
+    _ledcnt = __init_NEOPIXEL(pin=pin, n=ledcnt).n
     if Data.PERSISTENT_CACHE and Data.DCACHE[3] == 1:
         Data.DCACHE[3] = 0                  # Force ON at boot
         toggle(True)

micrOS/source/LM_oled.py

@@ -3,7 +3,7 @@
 from micropython import const
 import framebuf
 from machine import Pin, SoftI2C
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Types import resolve
 
 __INVERT = False
@@ -165,7 +165,7 @@ def load(width=128, height=64, brightness=50):
     :param brightness: percentage
     """
     if SSD1306_I2C.OLED_OBJ is None:
-        i2c = SoftI2C(Pin(resolve_pin('i2c_scl')), Pin(resolve_pin('i2c_sda')))
+        i2c = SoftI2C(Pin(bind_pin('i2c_scl')), Pin(bind_pin('i2c_sda')))
         # TODO: scan device - abort if no device is available
         SSD1306_I2C.OLED_OBJ = SSD1306_I2C(width, height, i2c)
         SSD1306_I2C.OLED_OBJ.contrast(percent=brightness)

micrOS/source/LM_oled_sh1106.py

@@ -16,7 +16,7 @@ from micropython import const
 import utime as time
 import framebuf
 from machine import Pin, I2C
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Types import resolve
 
 __INVERT = False
@@ -224,8 +224,8 @@ class SH1106_I2C(SH1106):
 
 def load(width=128, height=64, brightness=50, rotate=180):
     if SH1106_I2C.OLED_OBJ is None:
-        #i2c = SoftI2C(Pin(resolve_pin('i2c_scl')), Pin(resolve_pin('i2c_sda')))
-        i2c = I2C(scl=Pin(resolve_pin('i2c_scl')), sda=Pin(resolve_pin('i2c_sda')), freq=400000)
+        #i2c = SoftI2C(Pin(bind_pin('i2c_scl')), Pin(bind_pin('i2c_sda')))
+        i2c = I2C(scl=Pin(bind_pin('i2c_scl')), sda=Pin(bind_pin('i2c_sda')), freq=400000)
         # TODO: scan device - abort if no device is available
         SH1106_I2C.OLED_OBJ = SH1106_I2C(width, height, i2c, rotate=rotate)
         SH1106_I2C.OLED_OBJ.contrast(percent=brightness)

micrOS/source/LM_oled_ui.py

@@ -1,7 +1,7 @@
 from Config import cfgget
 from utime import localtime
 from network import WLAN, STA_IF
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Network import ifconfig
 from Common import syslog, exec_cmd, manage_task
 from machine import Pin
@@ -153,7 +153,7 @@ class PageUI:
         def _set(pin_tag, callback):
             pin = None
             try:
-                pin = resolve_pin(pin_tag)
+                pin = bind_pin(pin_tag)
             except Exception as e:
                 syslog(f'[ERR] {pin_tag} IRQ: {e}')
             if pin:

micrOS/source/LM_ph_sensor.py

@@ -1,5 +1,5 @@
 from time import sleep
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Common import SmartADC
 
 """
@@ -12,7 +12,7 @@ ADC.ATTN_11DB — the full range voltage: 3.3V
 
 
 def __measure(samples=10):
-    adc_obj = SmartADC.get_instance(resolve_pin('ph'))
+    adc_obj = SmartADC.get_instance(bind_pin('ph'))
     mbuf = 0
     for k in range(0, samples):
         mbuf += adc_obj.get()['volt']
@@ -22,7 +22,7 @@ def __measure(samples=10):
 
 
 def measure():
-    data = SmartADC.get_instance(resolve_pin('ph')).get()
+    data = SmartADC.get_instance(bind_pin('ph')).get()
     return "ADC data: {}\nAVG V: {}".format(data, __measure())
 
 

micrOS/source/LM_presence.py

@@ -1,4 +1,4 @@
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Common import SmartADC, micro_task, notify, syslog
 from utime import ticks_ms
 try:
@@ -96,7 +96,7 @@ async def __task(ms_period, buff_size):
 
     if Data.MIC_TYPE == Data.MIC_TYPES['ADC']:
         # Create ADC object
-        Data.MIC_ADC = SmartADC.get_instance(resolve_pin('mic'))
+        Data.MIC_ADC = SmartADC.get_instance(bind_pin('mic'))
     elif Data.MIC_TYPE == Data.MIC_TYPES['I2S']:
         if Data.I2S_MIC is None:
             import LM_i2s_mic

micrOS/source/LM_rencoder.py

@@ -1,7 +1,7 @@
 from machine import Pin
 import micropython
 from Common import socket_stream, syslog
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Types import resolve
 
 # https://www.coderdojotc.org/micropython/sensors/10-rotary-encoder/
@@ -76,7 +76,7 @@ def load(min_val=0, max_val=20):
     """
     if Data.ROTARY_OBJ is None:
         # GPIO Pins 33 and 35 are for the encoder pins.
-        Data.ROTARY_OBJ = Rotary(resolve_pin('rot_dt'), resolve_pin('rot_clk'))
+        Data.ROTARY_OBJ = Rotary(bind_pin('rot_dt'), bind_pin('rot_clk'))
         Data.MIN_VAL = min_val
         Data.MAX_VAL = max_val
         Data.VAL = min_val

micrOS/source/LM_rgb.py

@@ -5,7 +5,7 @@ from machine import Pin, PWM
 from sys import platform
 from Common import transition_gen, micro_task
 from utime import sleep_ms
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from random import randint
 from Types import resolve
 
@@ -26,19 +26,14 @@ class Data:
 #      ANALOG rgb WITH 3 channel PWM    #
 #########################################
 
-def __RGB_init():
+def __RGB_init(red_pin=None, green_pin=None, blue_pin=None):
     if Data.RGB_OBJS[0] is None or Data.RGB_OBJS[1] is None or Data.RGB_OBJS[2] is None:
-        red = Pin(resolve_pin('redgb'))
-        green = Pin(resolve_pin('rgreenb'))
-        blue = Pin(resolve_pin('rgbue'))
-        if platform == 'esp8266':
-            Data.RGB_OBJS = (PWM(red, freq=1024),
-                          PWM(green, freq=1024),
-                          PWM(blue, freq=1024))
-        else:
-            Data.RGB_OBJS = (PWM(red, freq=20480),
-                          PWM(green, freq=20480),
-                          PWM(blue, freq=20480))
+        red = Pin(bind_pin('redgb', red_pin))
+        green = Pin(bind_pin('rgreenb', green_pin))
+        blue = Pin(bind_pin('rgbue', blue_pin))
+        Data.RGB_OBJS = (PWM(red, freq=20480),
+                         PWM(green, freq=20480),
+                         PWM(blue, freq=20480))
     return Data.RGB_OBJS
 
 
@@ -73,20 +68,18 @@ def __state_machine(r, g, b):
     __persistent_cache_manager('s')
 
 
-def load(cache=None):
+def load(red_pin=None, green_pin=None, blue_pin=None, cache=True):
     """
     Initiate RGB 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)
+    :param red_pin: optional red color pin to overwrite built-in
+    :param green_pin: optional green color pin to overwrite built-in
+    :param blue_pin: optional blue color pin to overwrite built-in
+    :param cache: file state machine cache: True/False (.pds), default=True
     :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
+    Data.PERSISTENT_CACHE = cache
     __persistent_cache_manager('r')     # recover data cache if enabled
+    __RGB_init(red_pin, green_pin, blue_pin)
     if Data.RGB_CACHE[3] == 1:
         Data.RGB_CACHE[3] = 0           # Force ON at boot
         toggle(True)

micrOS/source/LM_servo.py

@@ -1,5 +1,5 @@
 from machine import Pin, PWM
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 
 
 class Data:
@@ -16,7 +16,7 @@ class Data:
 def __servo_init():
     if Data.S_OBJ is None:
         try:
-            pin = Pin(resolve_pin('servo_1'))
+            pin = Pin(bind_pin('servo_1'))
             Data.S_OBJ = PWM(pin, freq=50)
             del pin
         except Exception as e:
@@ -64,7 +64,7 @@ def sdemo():
 def __servo2_init():
     if Data.S_OBJ2 is None:
         try:
-            pin = Pin(resolve_pin('servo_2'))     # Alternative wiring
+            pin = Pin(bind_pin('servo_2'))     # Alternative wiring
             Data.S_OBJ2 = PWM(pin, freq=50)
             del pin
         except Exception as e:

micrOS/source/LM_stepper.py

@@ -2,7 +2,7 @@
 
 from utime import sleep_ms
 from machine import Pin
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 STEPPER_INST = None
 
 
@@ -30,10 +30,10 @@ class StepperULN2003:
                          [1, 0, 0, 1]]
             self.delay = 2
         # Init stepper pins
-        self.pin1 = Pin(resolve_pin('stppr_1'), Pin.OUT)
-        self.pin2 = Pin(resolve_pin('stppr_2'), Pin.OUT)
-        self.pin3 = Pin(resolve_pin('stppr_3'), Pin.OUT)
-        self.pin4 = Pin(resolve_pin('stppr_4'), Pin.OUT)
+        self.pin1 = Pin(bind_pin('stppr_1'), Pin.OUT)
+        self.pin2 = Pin(bind_pin('stppr_2'), Pin.OUT)
+        self.pin3 = Pin(bind_pin('stppr_3'), Pin.OUT)
+        self.pin4 = Pin(bind_pin('stppr_4'), Pin.OUT)
         # Initialize all value to 0 - "OFF"
         self.reset()
 

micrOS/source/LM_switch.py

@@ -1,5 +1,5 @@
 from machine import Pin
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Types import resolve
 
 #########################################
@@ -82,7 +82,7 @@ def load(cache=None, ch_init=None):
 
 def __switch_init():
     if __SWITCH_OBJ[0] is None:
-        __SWITCH_OBJ[0] = Pin(resolve_pin('switch_1'), Pin.OUT)
+        __SWITCH_OBJ[0] = Pin(bind_pin('switch_1'), Pin.OUT)
     return __SWITCH_OBJ[0]
 
 
@@ -118,7 +118,7 @@ def toggle():
 
 def __switch2_init():
     if __SWITCH_OBJ[1] is None:
-        __SWITCH_OBJ[1] = Pin(resolve_pin('switch_2'), Pin.OUT)
+        __SWITCH_OBJ[1] = Pin(bind_pin('switch_2'), Pin.OUT)
     return __SWITCH_OBJ[1]
 
 
@@ -153,7 +153,7 @@ def toggle2():
 
 def __switch3_init():
     if __SWITCH_OBJ[2] is None:
-        __SWITCH_OBJ[2] = Pin(resolve_pin('switch_3'), Pin.OUT)
+        __SWITCH_OBJ[2] = Pin(bind_pin('switch_3'), Pin.OUT)
     return __SWITCH_OBJ[2]
 
 
@@ -188,7 +188,7 @@ def toggle3():
 
 def __switch4_init():
     if __SWITCH_OBJ[3] is None:
-        __SWITCH_OBJ[3] = Pin(resolve_pin('switch_4'), Pin.OUT)
+        __SWITCH_OBJ[3] = Pin(bind_pin('switch_4'), Pin.OUT)
     return __SWITCH_OBJ[3]
 
 

micrOS/source/LM_trackball.py

@@ -8,7 +8,7 @@ https://github.com/mchobby/esp8266-upy/blob/master/trackball/examples/test_color
 from utime import sleep, ticks_ms, ticks_diff
 from struct import unpack
 from machine import SoftI2C, Pin
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Common import syslog
 from micropython import schedule
 
@@ -179,7 +179,7 @@ def load(width=100, height=100, irq_sampling=50, sensitivity=5, reload=False):
     """
     global TRACKBALL
     if TRACKBALL is None or reload:
-        i2c = SoftI2C(scl=Pin(resolve_pin('i2c_scl')), sda=Pin(resolve_pin('i2c_sda')))
+        i2c = SoftI2C(scl=Pin(bind_pin('i2c_scl')), sda=Pin(bind_pin('i2c_sda')))
         TRACKBALL = Trackball(i2c, max_x=width, max_y=height, irq_sampling=irq_sampling, sensitivity=sensitivity)
         _craft_event_interrupt()
         ready_color()
@@ -253,7 +253,7 @@ def _craft_event_interrupt():
             syslog(f"[ERR] Trackball user callback: {e}")
 
     try:
-        pin = resolve_pin("trackball_int")
+        pin = bind_pin("trackball_int")
     except Exception as e:
         pin = None
         syslog(f'[ERR] trackball_int IRQ: {e}')

micrOS/source/LM_veml7700.py

@@ -5,7 +5,7 @@
 from machine import SoftI2C, Pin
 from time import sleep
 from micropython import const
-from microIO import resolve_pin, pinmap_search
+from microIO import bind_pin, pinmap_search
 from Types import resolve
 
 # start const
@@ -134,7 +134,7 @@ def load():
     VEML7700 Digital light intensity sensor
     """
     if VEML7700.INSTANCE is None:
-        i2c = SoftI2C(Pin(resolve_pin('i2c_scl')), Pin(resolve_pin('i2c_sda')))
+        i2c = SoftI2C(Pin(bind_pin('i2c_scl')), Pin(bind_pin('i2c_sda')))
         VEML7700.INSTANCE = VEML7700(address=0x10, i2c=i2c, it=100, gain=1/8)
     return VEML7700.INSTANCE
 

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.9.7-0'
+    MICROS_VERSION = '2.9.8-0'
 
     def __init__(self):
         """