going for v0.3

Author: trevorwslee

.gitignore

@@ -1,9 +1,12 @@
 .idea
+.vscode
 venv
 __pycache__
 /u_dumbdisplay.iml
 MicroPythonDumbDisplay.iml
 
+dumbdisplay_experimental
+
 /_my_secret.py
 /_test.py
 /_dd.py

dumbdisplay/_ddlayer.py

@@ -2,6 +2,8 @@
 def DD_RGB_COLOR(r, g, b):
   return r * 0x10000 + g * 0x100 + b
 
+def _DD_INT_ARG(val):
+  return str(int(val))
 
 def _DD_BOOL_ARG(b):
   if b:
@@ -16,6 +18,7 @@ def _DD_COLOR_ARG(c):
     return str(c)
 
 
+
 class DDFeedback:
   def __init__(self, type, x, y):
     self.type = type
@@ -28,6 +31,7 @@ def __init__(self, dd, layer_id):
     self.layer_id = layer_id
     self._feedback_handler = None
     self._feedbacks = []
+    self.customData = ""
     dd._onCreatedLayer(self)
   def visibility(self, visible):
     '''set layer visibility'''
@@ -55,9 +59,18 @@ def border(self, size, color, shape: str = "flat", extra_size = 0):
       self.dd._sendCommand(self.layer_id, "border", str(size), _DD_COLOR_ARG(color), shape, str(extra_size))
   def noBorder(self):
     self.dd._sendCommand(self.layer_id, "border")
-  def padding(self, left, top, right, bottom):
+  def padding(self, left, top = None, right = None, bottom = None):
     '''see border() for size unit'''
-    self.dd._sendCommand(self.layer_id, "padding", str(left), str(top), str(right), str(bottom))
+    if top == None and right == None and bottom == None:
+      self.dd._sendCommand(self.layer_id, "padding", str(left))
+    else:
+      if top == None:
+        top = left
+      if right == None:
+        right = left
+      if bottom == None:
+        bottom = top
+      self.dd._sendCommand(self.layer_id, "padding", str(left), str(top), str(right), str(bottom))
   def noPadding(self):
     self.dd._sendCommand(self.layer_id, "padding")
   def margin(self, left, top, right, bottom):
@@ -125,6 +138,8 @@ def release(self):
     self.dd._deleteLayer(self.layer_id)
     self.dd._onDeletedLayer(self.layer_id)
     self.dd = None
+  def pinLayer(self, uLeft: int, uTop: int, uWidth: int, uHeight: int, align: str = ""):
+    self.dd._pinLayer(self.layer_id, uLeft, uTop, uWidth, uHeight, align)
 
 
   def _handleFeedback(self, type, x, y):

dumbdisplay/_ddlayer_graphical.py

@@ -1,6 +1,5 @@
 from ._ddlayer import DDLayer
-from ._ddlayer import _DD_COLOR_ARG
-from ._ddlayer import _DD_BOOL_ARG
+from ._ddlayer import _DD_COLOR_ARG, _DD_BOOL_ARG, _DD_INT_ARG
 
 class DDLayerGraphical(DDLayer):
   '''Graphical LCD'''
@@ -10,7 +9,7 @@ def __init__(self, dd, width, height):
     :param width: width
     :param height: height
     '''
-    layer_id = dd._createLayer(str("graphical"), str(width), str(height))
+    layer_id = dd._createLayer(str("graphical"), _DD_INT_ARG(width), _DD_INT_ARG(height))
     super().__init__(dd, layer_id)
   def setCursor(self, x, y):
     self.dd._sendCommand(self.layer_id, "setcursor", str(x), str(y))

dumbdisplay/_dumbdisplay.py

@@ -1,5 +1,6 @@
 from dumbdisplay._ddimpl import DumbDisplayImpl
 from dumbdisplay._ddiobase import DDInputOutput
+from ._ddlayer import _DD_INT_ARG, _DD_BOOL_ARG
 
 
 import sys
@@ -19,6 +20,8 @@ def __init__(self, orientation, *layers):
     '''
     self.orientation = orientation
     self.layers = layers
+  def build(self):
+    return self._build_layout()
   def pin(self, dd):
     layout_spec = self._build_layout()
     if layout_spec != None:
@@ -40,6 +43,9 @@ def _build_layout(self):
 
 
 class DumbDisplay(DumbDisplayImpl):
+  @staticmethod
+  def runningWithMicropython():
+    return hasattr(sys, 'implementation') and sys.implementation.name == 'micropython'
   def __init__(self, io: DDInputOutput):
     super().__init__(io)
     self.debug_led = None
@@ -69,6 +75,19 @@ def configAutoPin(self, layout_spec):
     '''
     self._connect()
     self._sendCommand(None, "CFGAP", layout_spec)
+  def configPinFrame(self, xUnitCount: int, yUnitCount: int):
+    self._connect()
+    self._sendCommand(None, "CFGPF", _DD_INT_ARG(xUnitCount), _DD_INT_ARG(yUnitCount))
+  def _pinLayer(self, layer_id: str, uLeft: int, uTop: int, uWidth: int, uHeight: int, align: str = ""):
+    self._sendCommand(layer_id, "PIN", _DD_INT_ARG(uLeft), _DD_INT_ARG(uTop), _DD_INT_ARG(uWidth), _DD_INT_ARG(uHeight), align)
+  def pinAutoPinLayers(self, layout_spec: str, uLeft: int, uTop: int, uWidth: int, uHeight: int, align: str = ""):
+    self._sendCommand(None, "PINAP", layout_spec, _DD_INT_ARG(uLeft), _DD_INT_ARG(uTop), _DD_INT_ARG(uWidth), _DD_INT_ARG(uHeight), align)
+  def recordLayerSetupCommands(self):
+    self._connect()
+    self._sendCommand(None, "RECC")
+  def playbackLayerSetupCommands(self, layerSetupPersistId: str):
+    self._sendCommand(None, "SAVEC", layerSetupPersistId, _DD_BOOL_ARG(True))
+    self._sendCommand(None, "PLAYC")
   def backgroundColor(self, color: str):
     '''set DD background color with common "color name"'''
     self._connect()

samples/doodle/_my_secret.py

@@ -0,0 +1,3 @@
+
+WIFI_SSID="your wifi router ssid"
+WIFI_PWD="your wifi router password"

samples/doodle/main.py

@@ -1,6 +1,5 @@
 
 from dumbdisplay.core import *
-from dumbdisplay.io_inet import *
 from dumbdisplay.layer_lcd import *
 from dumbdisplay.layer_graphical import *
 
@@ -28,7 +27,18 @@ def feedback_handler(layer, type, x, y):
 
 
 # create DumbDisplay connected using Inet (Python Internet connection)
-dd = DumbDisplay(io4Inet())
+if DumbDisplay.runningWithMicropython():
+    # connect using WIFI:
+    # assume a _my_secret.py Python script containing
+    #   WIFI_SSID="SSID"
+    #   WIFI_PWD="PASSWORD"
+    from _my_secret import *
+    from dumbdisplay.io_wifi import *
+    dd = DumbDisplay(io4Wifi(WIFI_SSID, WIFI_PWD))
+else:
+    # connect using Inet (Python Internet connection)
+    from dumbdisplay.io_inet import *
+    dd = DumbDisplay(io4Inet())
 
 # create 3 LCD layer as 3 tabs for changing color
 l_r = LayerLcd(dd)

samples/graphical/_my_secret.py

@@ -0,0 +1,3 @@
+
+WIFI_SSID="your wifi router ssid"
+WIFI_PWD="your wifi router password"

samples/graphical/main.py

@@ -1,10 +1,22 @@
 
 from dumbdisplay.core import *
-from dumbdisplay.io_inet import *
 from dumbdisplay.layer_graphical import LayerGraphical
 
-# create DumbDisplay connected using Inet (Python Internet connection)
-dd = DumbDisplay(io4Inet())
+# create DumbDisplay
+if DumbDisplay.runningWithMicropython():
+    # connect using WIFI:
+    # assume a _my_secret.py Python script containing
+    #   WIFI_SSID="SSID"
+    #   WIFI_PWD="PASSWORD"
+    from _my_secret import *
+    from dumbdisplay.io_wifi import *
+    dd = DumbDisplay(io4Wifi(WIFI_SSID, WIFI_PWD))
+else:
+    # connect using Inet (Python Internet connection)
+    from dumbdisplay.io_inet import *
+    dd = DumbDisplay(io4Inet())
+    
+import time    
 
 # create 4 graphical [LCD] layers
 l1 = LayerGraphical(dd, 150, 101)
@@ -17,13 +29,15 @@
 
 
 while True:
-    dd.writeComment("start")
+    dd.writeComment("start ...")
 
     # set fill screen with color
     l1.fillScreen("azure")
     l2.fillScreen("azure")
     l3.fillScreen("azure")
     l4.fillScreen("azure")
+    
+    start_ms = time.ticks_ms()
 
     # draw triangles
     left = 0
@@ -79,7 +93,11 @@
             l4.drawCircle(x, y, r, "teal")
             l4.drawCircle(x + r, y + r, r, "gold", True)
 
-    dd.writeComment("done ... will repeat in 5 second")
+    taken_s = (time.ticks_ms() - start_ms) / 1000.0
+    dd.writeComment(f"done ... in {taken_s:.2}s")
+
+
+    dd.writeComment("will repeat in 5 second")
     dd.delay(5)
     l1.clear()
     l2.clear()

samples/melody/_my_secret.py

@@ -0,0 +1,3 @@
+
+WIFI_SSID="your wifi router ssid"
+WIFI_PWD="your wifi router password"

samples/melody/main.py

@@ -0,0 +1,90 @@
+
+from dumbdisplay.core import *
+from dumbdisplay.layer_graphical import LayerGraphical
+from dumbdisplay.layer_lcd import LayerLcd
+
+
+TOP_HEIGHT = 30
+WIDTH = 14
+HEIGHT = 80
+BORDER = 1
+
+
+
+# create DumbDisplay
+if DumbDisplay.runningWithMicropython():
+    # connect using WIFI:
+    # assume a _my_secret.py Python script containing
+    #   WIFI_SSID="SSID"
+    #   WIFI_PWD="PASSWORD"
+    from _my_secret import *
+    from dumbdisplay.io_wifi import *
+    dd = DumbDisplay(io4Wifi(WIFI_SSID, WIFI_PWD))
+else:
+    # connect using Inet (Python Internet connection)
+    from dumbdisplay.io_inet import *
+    dd = DumbDisplay(io4Inet())
+
+
+def SetupKey(octiveOffset: int, noteIdx: int) -> LayerGraphical:
+    width = WIDTH - 2 * BORDER
+    xOffset = noteIdx * WIDTH / 2
+    #height
+    #bgColor
+    isSemi = False
+    if noteIdx == 1 or noteIdx == 3 or noteIdx == 6 or noteIdx == 8 or noteIdx == 10:
+        height = HEIGHT / 2 + 10
+        bgColor = "black"
+        isSemi = True
+    else:
+        height = HEIGHT
+        bgColor = "white"
+    if noteIdx > 4:
+        xOffset += WIDTH / 2
+    customData = chr(ord(" ") + octiveOffset) + chr(ord(" ") + noteIdx)
+    #customData[0] = '0' + octiveOffset;
+    #customData[1] = '0' + noteIdx;
+    #customData[2] = 0;
+    keyLayer = LayerGraphical(dd, width, height)
+    keyLayer.customData = customData
+    keyLayer.backgroundColor(bgColor)
+    keyLayer.border(BORDER, "gray")
+    keyLayer.padding(0)
+    #keyLayer->setFeedbackHandler(FeedbackHandler, "f");
+    if isSemi:
+        #dumbdisplay.reorderLayer(keyLayer, "T");
+        pass
+    else:
+        if noteIdx == 0:
+            keyLayer.drawStr(2, HEIGHT - 15, "C", "blue")
+    l = WIDTH + octiveOffset * 7 * WIDTH + xOffset
+    t  = TOP_HEIGHT
+    w = width + 2 * BORDER
+    h = height + 2 * BORDER
+    keyLayer.pinLayer(l, t, w, h)
+    return keyLayer
+
+def SetupButton(label: str) -> LayerLcd:
+    buttonLayer = LayerLcd(dd, 4, 1)
+    buttonLayer.writeLine(label, 0, "C")
+    buttonLayer.border(1, "darkgray", "round")
+    buttonLayer.noBackgroundColor()
+    #buttonLayer.setFeedbackHandler(FeedbackHandler, "f");
+    return buttonLayer
+
+dd.recordLayerSetupCommands()
+
+dd.configPinFrame(9 * WIDTH, TOP_HEIGHT + HEIGHT)
+
+SetupKey(-1, 11)
+for i in range(0, 12):
+    SetupKey(0, i)
+SetupKey(1, 0)
+
+playLayer = SetupButton("⏯");
+restartLayer = SetupButton("⏮");
+targetLayer = SetupButton("📱");
+
+dd.pinAutoPinLayers(AutoPin("H", playLayer, restartLayer, targetLayer).build(), 0, 0, 9 * WIDTH, TOP_HEIGHT)
+
+dd.playbackLayerSetupCommands("ddmelody")