Lilygo T-Deck keyboard improvements + I2S audio support

Author: RetiredWizard

PyDOS.py

@@ -67,7 +67,7 @@ def PyDOS():
     global envVars
     if "envVars" not in globals().keys():
         envVars = {}
-    _VER = "1.29"
+    _VER = "1.30"
     prmpVals = ['>','(',')','&','|','\x1b','\b','<','=',' ',_VER,'\n','$','']
 
     print("Starting Py-DOS...")
@@ -250,7 +250,7 @@ def dirLoop(tmpDir,lastDir,isFile,swPause,swWide,swRecur,prSum, \
                         break
                     dirHeadPrntd = True
 
-                if not ForD: 
+                if not ForD:
                     fSize = 0
                     nDirs += 1
                 else:
@@ -459,6 +459,7 @@ def readBATFile(BATfile):
         gc.collect()
 
     while True:
+        scrWdth = int(envVars["_scrWidth"])
         if condCmd != "":
             cmdLine = condCmd
             condCmd = ""
@@ -836,7 +837,7 @@ def readBATFile(BATfile):
                                 envVars[envCmdVar] = tHeight
                         elif envVars.get(envCmdVar) != None:
                             envVars.pop(envCmdVar)
-                    
+
                     scrWdth = int(envVars["_scrWidth"])
                     if envCmdVar == 'LIB':
                         path.clear()
@@ -869,7 +870,7 @@ def readBATFile(BATfile):
 # Second argument has valid path
                     if validPath and args[2][-1] != sep and '?' not in newdir2 and \
                         '*' not in newdir2 and newdir2 !="." and newdir2 != "..":
-                        
+
 # second argument doesn't specify an existing target
                         if newdir2 not in os.listdir(tmpDir2):
                             currDRen = False

cpython/boardconfigs/pydos_bcfg_lilygo_tdeck.py

@@ -3,6 +3,9 @@
 import board
 
 Pydos_pins = {
+    'i2s_BitClock'   : (board.SPEAKER_SCK,"board.SPEAKER_SCK IO7"),
+    'i2s_WordSelect' : (board.SPEAKER_WS,"board.SPEAKER_WS IO5"),
+    'i2s_Data'       : (board.SPEAKER_DOUT,"board.SPEAKER_DOUT IO6"),
     'SCL' : (board.SCL,"SCL IO8"),
     'SDA' : (board.SDA,"SDA IO18"),
     'SCK' : [(board.SCK,"SCK IO40")],

cpython/boardconfigs/pydos_bcfg_pimoroni_pico_dv_base.py

@@ -3,6 +3,9 @@
 import board
 
 Pydos_pins = {
+    'i2s_BitClock'   : (board.I2S_BIT_CLOCK,"board.I2S_BIT_CLOCK, GP27"),
+    'i2s_WordSelect' : (board.I2S_WORD_SELECT,"board.I2S_WORD_SELECT, GP28"),
+    'i2s_Data'       : (board.I2S_DATA,"board.IS2_DATA, GP26"),
     'SCL'    : (board.GP1,"GP1"),
     'SDA'    : (board.GP0,"GP0"),
     'SCK'    : [(board.SD_SCK,"SD_SCK")],

cpython/lib/optional/pydos_ui_lilygokbd.py

@@ -1,16 +1,16 @@
 from sys import stdin,stdout,implementation
 
 import board
+import keypad
+import time
 from supervisor import runtime
 from pydos_hw import Pydos_hw
 from adafruit_bus_device.i2c_device import I2CDevice
-import countio
-import keypad
-import time
 
 class PyDOS_UI:
 
     def __init__(self):
+        self.trackevent = None
         self.scrollable = False
         self.arrow = ""
         self._cmdhistlock = False
@@ -22,13 +22,16 @@ def __init__(self):
         self.commandHistory = [""]
 
        	self._i2c = I2CDevice(Pydos_hw.I2C(), _ADDRESS_KBD)
-        self.trackball = {
-            "A": countio.Counter(board.TRACKBALL_UP),
-            "B": countio.Counter(board.TRACKBALL_DOWN),
-            "C": countio.Counter(board.TRACKBALL_RIGHT),
-            "D": countio.Counter(board.TRACKBALL_LEFT)
-        }
-        self.click = keypad.Keys([board.TRACKBALL_CLICK], value_when_pressed=False)
+        self.trackball = keypad.Keys(
+            [
+                board.TRACKBALL_CLICK,
+                board.TRACKBALL_UP,
+                board.TRACKBALL_DOWN,
+                board.TRACKBALL_LEFT,
+                board.TRACKBALL_RIGHT
+            ],
+            value_when_pressed=False
+        )
 
     def get_screensize(self):
         return (19,51)
@@ -39,26 +42,13 @@ def serial_bytes_available(self):
 
             # Find the last direction the trackball was moved
             #  and wait for trackball to stop moving
-            largestDir = 0
             self.arrow = ''
-            trackloop = True
-            while trackloop:
-                trackloop = False
-                for p,c in Pydos_ui.trackball.items():
-                    if c.count > largestDir:
-                        trackloop = True
-                        if p not in "AB" or not self._cmdhistlock:
-                            self.arrow = p
-                            largestDir = c.count
-                        c.reset()
-                    else:
-                        c.reset()
-                if self.arrow != "" and not trackloop:
-                    time.sleep(.05)
-                    # clear all counters
-                    for p,c in Pydos_ui.trackball.items():
-                        if c.count > 0:
-                            c.reset()
+            self.trackevent = Pydos_ui.trackball.events.get()
+            if self.trackevent and (self.trackevent.key_number not in [1,2] or not self._cmdhistlock):
+                self.arrow = ' ABDC'[self.trackevent.key_number]
+                if self.arrow == " ":
+                    self.arrow = ""
+                else:
                     retval = 1
                     self._touched = True
 
@@ -231,7 +221,7 @@ def input(disp_text=None):
                 editCol -= 1
             elif arrow !='':
                 pass
-            elif keys[editCol-1:editCol] == '\x08':
+            elif keys[editCol-1:editCol] in ['\x08','\x7f']:
                 keys = keys[:max(0,editCol-2)]+keys[editCol:]
                 if editCol > 1:
                     print(('\x08'*(editCol-1))+keys+'  \x08\x08',end="")

lib/pydos_bcfg.py

@@ -6,6 +6,9 @@
 
     led
     sndPin
+    i2s_BitClock
+    i2s_WordSelect
+    i2s_Data
     neoPixel
     neoPixel_Pow
     dotStar_Clock
@@ -68,6 +71,14 @@
         Pydos_pins['sndPin'] = (board.BUZZER,"board.BUZZER")
     elif 'D12' in dir(board):
         Pydos_pins['sndPin'] = (board.D12,"D12 GPIO12")
+    if 'I2S_BIT_CLOCK' in dir(board):
+        Pydos_pins['i2s_BitClock'] = (board.I2S_BIT_CLOCK,"board.I2S_BIT_CLOCK")
+        Pydos_pins['i2s_WordSelect'] = (board.I2S_WORD_SELECT,"board.I2S_WORD_SELECT")
+        Pydos_pins['i2s_Data'] = (board.I2S_DATA,"board.I2S_DATA")
+    elif 'SPEAKER_SCK' in dir(board):
+        Pydos_pins['i2s_BitClock'] = (board.SPEAKER_SCK,"board.SPEAKER_SCK")
+        Pydos_pins['i2s_WordSelect'] = (board.SPEAKER_WS,"board.SPEAKER_WS")
+        Pydos_pins['i2s_Data'] = (board.SPEAKER_DOUT,"board.SPEAKER_DOUT")
     if 'NEOPIXEL' in dir(board):
         Pydos_pins['neoPixel'] = (board.NEOPIXEL,"NEOPIXEL")
     if 'NEOPIXEL_POWER' in dir(board):

lib/pydos_hw.py

@@ -76,6 +76,9 @@ def __init__(self):
                 pass
 
         self.sndPin = Pydos_pins.get('sndPin',(None,None))[0]
+        self.i2sSCK = Pydos_pins.get('i2s_BitClock',(None,None))[0]
+        self.i2sWS = Pydos_pins.get('i2s_WordSelect',(None,None))[0]
+        self.i2sDATA = Pydos_pins.get('i2s_Data',(None,None))[0]
         self.neoPixel = Pydos_pins.get('neoPixel',(None,None))[0]
         self.neoPixel_Pow = Pydos_pins.get('neoPixel_Pow',(None,None))[0]
         self.dotStar_Clock = Pydos_pins.get('dotStar_Clock',(None,None))[0]
@@ -125,6 +128,21 @@ def __init__(self):
                     pass
 
         if implementation.name.upper() == 'CIRCUITPYTHON':
+            if not self.i2sSCK:
+                if 'I2S_BIT_CLOCK' in dir(board):
+                    try:
+                        self.i2sWS = board.I2S_WORD_SELECT
+                        self.i2sDATA = board.I2S_DATA
+                        self.i2sSCK = board.I2S_BIT_CLOCK
+                    except:
+                        self.i2sWS = None
+                elif 'SPEAKER_SCK' in dir(board):
+                    try:
+                        self.i2sWS = board.SPEAKER_WS
+                        self.i2sDATA = board.SPEAKER_DOUT
+                        self.i2sSCK = board.SPEAKER_SCK
+                    except:
+                        self.i2sWS = None
             if not self.led:
                 if 'LED1' in dir(board):
                     self.led = board.LED1

piano.py

@@ -11,9 +11,15 @@
     from supervisor import ticks_ms
     from pwmio import PWMOut
     from board import board_id
+    try:
+        import synthio
+        import audiobusio
+    except:
+        pass
 
 def piano():
 
+    noteMS = 500
     if sys.implementation.name.upper() == 'MICROPYTHON':
         oldPWM = False
         try:
@@ -23,66 +29,78 @@ def piano():
         except:
             pwm=machine.PWM(Pydos_hw.sndPin)
     elif sys.implementation.name.upper() == 'CIRCUITPYTHON':
-        Pydos_hw.sndGPIO.deinit() # Workaround for ESP32-S2 GPIO issue
-        pwm=PWMOut(Pydos_hw.sndPin, duty_cycle=0, frequency=440, variable_frequency=True)
+        if Pydos_hw.i2sSCK:
+            noteMS = 375
+            i2s = audiobusio.I2SOut(Pydos_hw.i2sSCK,Pydos_hw.i2sWS,Pydos_hw.i2sDATA)
+            synth = synthio.Synthesizer(sample_rate=22050)
+            e = synthio.Envelope(attack_time=.0001,decay_time=.0001,release_time=0,attack_level=.5,sustain_level=.5)
+            i2s.play(synth)
+        else:
+            Pydos_hw.sndGPIO.deinit() # Workaround for ESP32-S2 GPIO issue
+            pwm=PWMOut(Pydos_hw.sndPin, duty_cycle=0, frequency=440, variable_frequency=True)
 
     print ("\nPress +/- to change volume, 'q' to quit...")
 
     volume = 400
+    lastVol = 400
     cmnd = None
     press = False
     noneAt = ticks_ms()
     firstNone = True
     note = 0
+    rnote = 0.0
+    lastNote = -1
     while cmnd != "q":
         if Pydos_ui.serial_bytes_available() != 0:
             cmnd = Pydos_ui.read_keyboard(1)
             #print("->"+cmnd+"<- : ",ord(cmnd[0]))
             firstNone = True
             if cmnd=="h": # middle C
-                note=int(261.6256+.5)
+                rnote=261.6256
                 press = True
             elif cmnd == "a": # E
-                note=int(164.8138+.5)
+                rnote=164.8138
                 press = True
             elif cmnd == "s": # F
-                note=int(174.6141+.5)
+                rnote=174.6141
                 press = True
             elif cmnd == "d": # G
-                note=int(195.9977+.5)
+                rnote=195.9977
                 press = True
             elif cmnd == "r": # G sharp/A flat
-                note=int(207.6523+.5)
+                rnote=207.6523
                 press = True
             elif cmnd == "f": # A
-                note=int(220)
+                rnote=220.0
                 press = True
             elif cmnd == "t": # A sharp/B flat
-                note=int(233.0819+.5)
+                rnote=233.0819
                 press = True
             elif cmnd == "g": # B
-                note=int(246.9417+.5)
+                rnote=246.9417
                 press = True
             elif cmnd == "u": # C sharp/D flat
-                note=int(277.1826+.5)
+                rnote=277.1826
                 press = True
             elif cmnd == "j": # D
-                note=int(293.6648+.5)
+                rnote=293.6648
                 press = True
             elif cmnd == "k": # E
-                note=int(329.6276+.5)
+                rnote=329.6276
                 press = True
             elif cmnd == "l": # F
-                note=int(349.2262+.5)
+                rnote=349.2262
                 press = True
             elif cmnd == "o": # F sharp/G flat
-                note=int(369.9944+.5)
+                rnote=369.9944
                 press = True
             elif cmnd == ";": # G
-                note=int(391.9954+.5)
+                rnote=391.9954
                 press = True
             elif cmnd == "q":
                 break
+            if press:
+                note = int(rnote+.5)
 
             if cmnd == "+":
                 volume += 100
@@ -93,7 +111,7 @@ def piano():
                 noneAt = ticks_ms()
                 firstNone = False
             else:
-                if ticks_ms() > noneAt+500:
+                if ticks_ms() > noneAt+noteMS:
                     firstNone = True
                     press = False
 
@@ -111,18 +129,25 @@ def piano():
                 if "ESP32" in sys.implementation._machine or "S2" in sys.implementation._machine:
                     sleep(.1)
             elif sys.implementation.name.upper() == 'CIRCUITPYTHON':
-                if pwm.frequency != note:
-                    pwm.frequency = note
-                if pwm.duty_cycle != volume:
-                    pwm.duty_cycle = volume
-                if "s2" in board_id or "s3" in board_id:
-                    sleep(.1)
+                if Pydos_hw.i2sSCK:
+                    if lastNote != rnote:
+                        if lastNote != -1:
+                            synth.release(snote)
+                        volume = max(0,min(1000,volume))
+                        if lastVol != volume:
+                            lastVol = volume
+                            e = synthio.Envelope(attack_time=.0001,decay_time=.0001,release_time=0,attack_level=volume/1000,sustain_level=volume/1000)
+                        snote = synthio.Note(frequency=rnote,envelope=e)
+                        synth.press(snote)
+                        lastNote = rnote
+                else:
+                    if pwm.frequency != note:
+                        pwm.frequency = note
+                    if pwm.duty_cycle != volume:
+                        pwm.duty_cycle = volume
+                    if "s2" in board_id or "s3" in board_id:
+                        sleep(.1)
 
-            #time.sleep(.1)
-            #cmnd = kbdInterrupt()
-            #while cmnd != None:
-                #cmnd = kbdInterrupt()
-            #pressedat = time.time()
         else:
             if sys.implementation.name.upper() == 'MICROPYTHON':
                 if oldPWM:
@@ -132,15 +157,23 @@ def piano():
                 else:
                     pwm.duty(0)
             elif sys.implementation.name.upper() == 'CIRCUITPYTHON':
-                if pwm.duty_cycle != 0:
-                    pwm.duty_cycle = 0
-            #print("Release")
+                if Pydos_hw.i2sSCK:
+                    if lastNote != -1:
+                        synth.release(snote)
+                        lastNote = -1
+                else:
+                    if pwm.duty_cycle != 0:
+                        pwm.duty_cycle = 0
 
     if sys.implementation.name.upper() == 'CIRCUITPYTHON':
-        pwm.deinit()
-        quietSnd() # Workaround for ESP32-S2 GPIO issue
+        if Pydos_hw.i2sSCK:
+            synth.deinit()
+            i2s.deinit()
+        else:
+            pwm.deinit()
+            quietSnd() # Workaround for ESP32-S2 GPIO issue
 
-if Pydos_hw.sndPin:
+if Pydos_hw.sndPin or Pydos_hw.i2sSCK:
     piano()
 else:
     print("Sound Pin not found")