going for v0.3.0

Author: trevorwslee

samples/melody/main.py

@@ -171,6 +171,8 @@ def __init__(self):
         self.playToSpeaker = False
         self.restart = False
         self.adhocFreq = -1
+        self.lyricX = -1
+        self.lyricY = -1
 
         dd.recordLayerSetupCommands()
 
@@ -184,10 +186,10 @@ def __init__(self):
         self.playLayer = self.setupButton("⏯")
         self.restartLayer = self.setupButton("⏮")
         self.targetLayer = self.setupButton("📢")
-        self.lyricLayer = LayerLcd(dd, 20, 2)
+        self.lyricLayer = LayerLcd(dd, 40, 4)
         self.lyricLayer.margin(2)
         self.lyricLayer.border(1, "blue", "round")
-        self.lyricLayer.writeCenteredLine("hello")
+        self.lyricLayer.writeCenteredLine("hello", 1)
 
         if not HWPlayToneBlocked:
             self.targetLayer.disabled()
@@ -203,13 +205,13 @@ def __init__(self):
     def run(self):
         while True:
             i = 0
-            self.lyricLayer.clear()
             while True:
                 dd.timeslice()
                 if self.adhocFreq != -1:
                     # key on DumbDisplay pressed ...  play the note/tone of the key press
                     if not self.play:
-                        self.lyricLayer.writeCenteredLine(f"🎵 {self.adhocFreq}")
+                        self.lyricLayer.clear()
+                        self.lyricLayer.writeCenteredLine(f"🎵 {self.adhocFreq}", 1)
                     PlayTone(self.adhocFreq, 200, self.playToSpeaker)
                     self.adhocFreq = -1
                 if self.restart:
@@ -218,6 +220,16 @@ def run(self):
                     break
                 if not self.play:
                     continue
+
+                if self.lyricX != -1 and self.lyricY != -1:
+                    lyeric1 = ""
+                    lyeric2 = ""
+                    lyerics1 = Lyrics[self.lyricY]
+                    for l1 in lyerics1:
+                        noteCount = int(l1[0:1])
+                        lyeric1 = lyeric1 + l1[2:] + " "
+                    self.lyricLayer.writeCenteredLine(lyeric1, 1)
+                    self.lyricLayer.writeCenteredLine(lyeric2, 2)
                 noteName = Song[i]
                 if noteName == "Z":
                     # reached end of song => break out of loop
@@ -288,6 +300,8 @@ def feedbackHandler(self, layer, type, x, y):
             self.play = not self.play
             if self.play:
                 self.playLayer.backgroundColor("lightgreen")
+                self.lyricX = 0
+                self.lyricY = 0
             else:
                 self.playLayer.noBackgroundColor()
         elif layer == self.targetLayer:
@@ -298,6 +312,8 @@ def feedbackHandler(self, layer, type, x, y):
                 self.targetLayer.noBackgroundColor()
         elif layer == self.restartLayer:
             self.restart = True
+            self.lyricX = 0
+            self.lyricY = 0
         else:
             octaveOffset = layer.octaveOffset
             noteIdx = layer.noteIdx