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

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

@@ -3,7 +3,8 @@
 from micropython import const
 import framebuf
 from machine import Pin, SoftI2C
-from microIO import physical_pin, pinmap_dump
+from microIO import bind_pin, pinmap_search
+from Types import resolve
 
 __INVERT = False
 
@@ -157,14 +158,14 @@ class SSD1306_I2C(SSD1306):
 #  SSD1306 interface functions    #
 ###################################
 
-def load_n_init(width=128, height=64, brightness=50):
+def load(width=128, height=64, brightness=50):
     """
     :param width: pixel
     :param height: pixel
     :param brightness: percentage
     """
     if SSD1306_I2C.OLED_OBJ is None:
-        i2c = SoftI2C(Pin(physical_pin('i2c_scl')), Pin(physical_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)
@@ -178,7 +179,7 @@ def text(string="text", x=0, y=0):
     :param x: 0-127
     :param y: 0-63
     """
-    load_n_init().text(string, x, y)
+    load().text(string, x, y)
     return True
 
 
@@ -187,7 +188,7 @@ def invert():
     Invert OLED display
     """
     global __INVERT
-    load_n_init()
+    load()
     __INVERT = not __INVERT
     SSD1306_I2C.OLED_OBJ.invert(__INVERT)
     return True
@@ -198,7 +199,7 @@ def clean(state=0):
     Clean display
     :param state: 0/1
     """
-    load_n_init().fill(state)
+    load().fill(state)
     return True
 
 
@@ -211,7 +212,7 @@ def line(sx, sy, ex, ey, state=1):
     :param ey: end y
     :param state: state 0/1
     """
-    load_n_init().line(sx, sy, ex, ey, state)
+    load().line(sx, sy, ex, ey, state)
     return True
 
 
@@ -226,9 +227,9 @@ def rect(x, y, w, h, state=1, fill=False):
     :param fill: fill rectangle (True/False)
     """
     if fill:
-        load_n_init().fill_rect(x, y, w, h, state)
+        load().fill_rect(x, y, w, h, state)
     else:
-        load_n_init().rect(x, y, w, h, state)
+        load().rect(x, y, w, h, state)
     return True
 
 def pixel(x, y, color=1):
@@ -237,7 +238,7 @@ def pixel(x, y, color=1):
     Set pixel
     .pixel(x, y, c)
     """
-    load_n_init().pixel(x, y, color)  # 3rd param is the colour
+    load().pixel(x, y, color)  # 3rd param is the colour
     return True
 
 
@@ -280,7 +281,7 @@ def bitmap(bmp=None, x=0, y=0):
                '00001100110000',
                '00001100110000')
 
-    display = load_n_init()
+    display = load()
     for _y, row in enumerate(bmp):
         for _x, c in enumerate(row):
             display.pixel(_x+x, _y+y, int(c))
@@ -296,7 +297,7 @@ def image(pbm_img, x=0, y=0):
     :param x: x offset
     :param y: y offset
     """
-    load_n_init().image(pbm_file=pbm_img, x=x, y=y)
+    load().image(pbm_file=pbm_img, x=x, y=y)
     return True
 
 
@@ -305,7 +306,7 @@ def poweron():
     """
     Power ON OLED
     """
-    load_n_init().poweron()
+    load().poweron()
     return True
 
 
@@ -313,7 +314,7 @@ def poweroff():
     """
     Power OFF OLED
     """
-    load_n_init().poweroff()
+    load().poweroff()
     return True
 
 
@@ -336,7 +337,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):
@@ -346,8 +347,15 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'load_n_init width=128 height=64',\
-           'text "text" x y', 'invert', 'clean state=<0/1>',\
-           'line sx sy ex ey state=1', 'rect x y w h state=1 fill=False',\
-           'pixel x y color=1', 'bitmap bmp=<str tuple> x=0 y=0', 'image pbm_img x=0 y=0',\
-           'show', 'poweron', 'poweroff', 'pinmap', 'INFO: OLED Module for SSD1306'
+    return resolve(('load width=128 height=64',
+                             'text "text" x y',
+                             'BUTTON invert',
+                             'clean state=<0/1>',
+                             'line sx sy ex ey state=1',
+                             'rect x y w h state=1 fill=False',
+                             'pixel x y color=1',
+                             'bitmap bmp=<str tuple> x=0 y=0',
+                             'image pbm_img x=0 y=0',
+                             'show', 'BUTTON poweron', 'BUTTON poweroff',
+                             'pinmap', '[Info] OLED Module for SSD1306'), widgets=widgets)
+

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

@@ -16,7 +16,8 @@ from micropython import const
 import utime as time
 import framebuf
 from machine import Pin, I2C
-from microIO import physical_pin, pinmap_dump
+from microIO import bind_pin, pinmap_search
+from Types import resolve
 
 __INVERT = False
 
@@ -221,10 +222,10 @@ class SH1106_I2C(SH1106):
 #   SH1106 interface functions    #
 ###################################
 
-def load_n_init(width=128, height=64, brightness=50, rotate=180):
+def load(width=128, height=64, brightness=50, rotate=180):
     if SH1106_I2C.OLED_OBJ is None:
-        #i2c = SoftI2C(Pin(physical_pin('i2c_scl')), Pin(physical_pin('i2c_sda')))
-        i2c = I2C(scl=Pin(physical_pin('i2c_scl')), sda=Pin(physical_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)
@@ -238,7 +239,7 @@ def text(string="text", x=0, y=0):
     :param x: 0-127
     :param y: 0-63
     """
-    load_n_init().text(string, x, y, color=1)
+    load().text(string, x, y, color=1)
     return True
 
 
@@ -247,9 +248,9 @@ def invert():
     Invert OLED display
     """
     global __INVERT
-    load_n_init()
+    load()
     __INVERT = not __INVERT
-    load_n_init().invert(invert=__INVERT)
+    load().invert(invert=__INVERT)
     return True
 
 
@@ -258,7 +259,7 @@ def clean(state=0):
     Clean display
     :param state: 0/1
     """
-    load_n_init().fill(state)
+    load().fill(state)
     return True
 
 
@@ -271,7 +272,7 @@ def line(sx, sy, ex, ey, state=1):
     :param ey: end y
     :param state: state 0/1
     """
-    load_n_init().line(sx, sy, ex, ey, state)
+    load().line(sx, sy, ex, ey, state)
     return True
 
 
@@ -286,14 +287,14 @@ def rect(x, y, w, h, state=1, fill=False):
     :param fill: fill rectangle (True/False)
     """
     if fill:
-        load_n_init().fill_rect(x, y, w, h, state)
+        load().fill_rect(x, y, w, h, state)
     else:
-        load_n_init().rect(x, y, w, h, state)
+        load().rect(x, y, w, h, state)
     return True
 
 
 def pixel(x, y, state=1):
-    load_n_init().pixel(x, y, color=state)
+    load().pixel(x, y, color=state)
     return True
 
 
@@ -336,7 +337,7 @@ def bitmap(bmp=None, x=0, y=0):
                '00001100110000',
                '00001100110000')
 
-    display = load_n_init()
+    display = load()
     for _y, row in enumerate(bmp):
         for _x, c in enumerate(row):
             display.pixel(_x+x, _y+y, int(c))
@@ -347,7 +348,7 @@ def poweron():
     """
     Power ON OLED
     """
-    load_n_init().poweron()
+    load().poweron()
     return True
 
 
@@ -355,7 +356,7 @@ def poweroff():
     """
     Power OFF OLED
     """
-    load_n_init().poweroff()
+    load().poweroff()
     return True
 
 
@@ -364,11 +365,11 @@ def show():
     Show OLED buffer data
     - update display
     """
-    load_n_init().show()
+    load().show()
 
 
 def flip():
-    load_n_init().flip()
+    load().flip()
     return True
 
 
@@ -383,7 +384,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):
@@ -393,10 +394,13 @@ def help(widgets=False):
         (widgets=False) list of functions implemented by this application
         (widgets=True) list of widget json for UI generation
     """
-    return 'load_n_init width=128 height=64 rotate=180',\
-           'text "text" x y', 'invert', 'clean state=<0/1>',\
-           'line sx sy ex ey state=1', 'rect x y w h state=1 fill=False',\
-           'pixel x y state', 'bitmap bmp=None x=0 y=0',\
-           'show', 'poweron', 'poweroff', 'flip', 'pinmap',\
-           'INFO: OLED Module for SH1106'
+    return resolve(('load width=128 height=64 rotate=180',
+                             'text "text" x y',
+                             'BUTTON invert', 'clean state=<0/1>',
+                             'line sx sy ex ey state=1',
+                             'rect x y w h state=1 fill=False',
+                             'pixel x y state', 'bitmap bmp=None x=0 y=0',
+                             'show', 'BUTTON poweron', 'BUTTON poweroff',
+                             'flip', 'pinmap',
+                             '[Info] OLED Module for SH1106'), widgets=widgets)