refactor for fruitjam library new API

RetiredWizard · RetiredWizard · commit a8e8e8d76f8f · 2025-09-11T01:12:09.000-04:00
diff --git a/Fruit_Jam/Larsio_Paint_Music/sound_manager.py b/Fruit_Jam/Larsio_Paint_Music/sound_manager.py
@@ -19,12 +19,11 @@
 import adafruit_midi
 import audiocore
 import audiopwmio
-import audiobusio
 import audiomixer
 import synthio
 import board
 import adafruit_pathlib as pathlib
-import adafruit_tlv320
+import adafruit_fruitjam
 from adafruit_midi.note_on import NoteOn
 from adafruit_midi.note_off import NoteOff
 import usb_midi
@@ -67,9 +66,13 @@ def __init__(self, audio_output="pwm", seconds_per_eighth=0.25):
         else:  # i2s
             # optional configuration file for speaker/headphone setting
             launcher_config = {}
-            if pathlib.Path("/launcher.conf.json").exists():
-                with open("/launcher.conf.json", "r") as f:
-                    launcher_config = json.load(f)
+            for directory in ("/", "/sd/", "/saves/"):
+                launcher_config_path = directory + "launcher.conf.json"
+                if pathlib.Path(launcher_config_path).exists():
+                    with open(launcher_config_path, "r") as f:
+                        launcher_config = launcher_config | json.load(f)
+            if "audio" not in launcher_config:
+                launcher_config["audio"] = {}
 
             try:
                 # Import libraries needed for I2S
@@ -84,11 +87,17 @@ def __init__(self, audio_output="pwm", seconds_per_eighth=0.25):
                     time.sleep(0.1)  # Pause 100ms
                     reset_pin.value = True  # Set high to release from reset
 
-                    i2c = board.STEMMA_I2C()  # initialize I2C
+                    # Initialize TLV320
+                    fjPeriphs = adafruit_fruitjam.Peripherals(
+                        audio_output=launcher_config["audio"].get("output", "headphone"), 
+                        safe_volume_limit=launcher_config["audio"].get("volume_override_danger",12),
+                        sample_rate=11025,
+                        bit_depth=16,
+                        i2c=board.STEMMA_I2C()
+                    )
 
-                    bclck_pin = board.D9
-                    wsel_pin = board.D10
-                    din_pin = board.D11
+                    self.tlv = fjPeriphs.dac
+                    fjPeriphs.audio = audiobusio.I2SOut(board.D9, board.D10, board.D11)
 
                 elif 'Fruit Jam' in board_type:
                     print("Fruit Jam setup")
@@ -98,38 +107,27 @@ def __init__(self, audio_output="pwm", seconds_per_eighth=0.25):
                     time.sleep(0.1)
                     reset_pin.value = True
 
-                    i2c = busio.I2C(board.SCL, board.SDA)
+                    # Initialize TLV320
+                    fjPeriphs = adafruit_fruitjam.Peripherals(
+                        audio_output=launcher_config["audio"].get("output", "headphone"), 
+                        safe_volume_limit=launcher_config["audio"].get("volume_override_danger",12),
+                        sample_rate=11025,
+                        bit_depth=16,
+                        i2c=board.I2C()
+                    )
 
-                    bclck_pin = board.I2S_BCLK
-                    wsel_pin = board.I2S_WS
-                    din_pin = board.I2S_DIN
+                    self.tlv = fjPeriphs.dac
 
-                # Initialize TLV320
-                self.tlv = adafruit_tlv320.TLV320DAC3100(i2c)
-
-                # set sample rate & bit depth
-                self.tlv.configure_clocks(sample_rate=11025, bit_depth=16)
-
-                if "tlv320" in launcher_config:
-                    if launcher_config["tlv320"].get("output") == "speaker":
-                        # use speaker
-                        self.tlv.speaker_output = True
-                        self.tlv.dac_volume = launcher_config["tlv320"].get("volume",5)  # dB
-                    else:
-                        # use headphones
-                        self.tlv.headphone_output = True
-                        self.tlv.dac_volume = launcher_config["tlv320"].get("volume",0)  # dB
-                else:
-                    # default to headphones
-                    self.tlv.headphone_output = True
-                    self.tlv.dac_volume = 0  # dB
+                # If volume was specified use it, otherwise use the fruitjam library default
+                if "volume_override_danger" in launcher_config["audio"]:
+                    fjPeriphs.volume = launcher_config["audio"]["volume_override_danger"]
+                elif "volume" in launcher_config["audio"]:
+                    fjPeriphs.volume = launcher_config["audio"]["volume"] # FruitJam vol (1-20)
 
                 # Setup I2S audio output - important to do this AFTER configuring the DAC
-                self.audio = audiobusio.I2SOut(
-                    bit_clock=bclck_pin,
-                    word_select=wsel_pin,
-                    data=din_pin
-                )
+                # Fruitjam library actually does this before we modify the configuration
+                # but after the initial default configuration is performed
+                self.audio = fjPeriphs.audio
 
                 print("TLV320 I2S DAC initialized successfully")
             except Exception as e:
@@ -617,6 +615,7 @@ def deinit(self):
             try:
                 # For TLV320DAC3100, headphone_output = False will power down the output
                 self.tlv.headphone_output = False
+                self.tlv.speaker_output = False
             except Exception:
                 pass
 
diff --git a/Metro/Metro_RP2350_Chips_Challenge/audio.py b/Metro/Metro_RP2350_Chips_Challenge/audio.py
@@ -14,7 +14,7 @@ def __init__(self, audio_bus, sounds):
         self.play(tuple(self._wav_files.keys())[0], wait=True)
 
     def play(self, sound_name, wait=False):
-        if not PLAY_SOUNDS:
+        if not PLAY_SOUNDS or self._audio is None:
             return
         if sound_name in self._wav_files:
             with open(self._wav_files[sound_name], "rb") as wave_file:
diff --git a/Metro/Metro_RP2350_Chips_Challenge/code.py b/Metro/Metro_RP2350_Chips_Challenge/code.py
@@ -2,13 +2,14 @@
 #
 # SPDX-License-Identifier: MIT
 
+import json
 import time
 import board
-import picodvi
-import framebufferio
-import displayio
+import supervisor
 import audiobusio
 from audio import Audio
+import adafruit_pathlib as pathlib
+import adafruit_fruitjam.Peripherals
 from game import Game
 from definitions import SECOND_LENGTH, TICKS_PER_SECOND
 
@@ -36,24 +37,41 @@
     "TIME_UP": "sounds/bell.wav"
 }
 
-displayio.release_displays()
+# optional configuration file for speaker/headphone setting
+launcher_config = {}
+for directory in ("/", "/sd/", "/saves/"):
+    launcher_config_path = directory + "launcher.conf.json"
+    if pathlib.Path(launcher_config_path).exists():
+        with open(launcher_config_path, "r") as f:
+            launcher_config = launcher_config | json.load(f)
+if "audio" not in launcher_config:
+    launcher_config["audio"] = {}
 
-if hasattr(board, "I2S_BCLK"):
-    audio_bus = audiobusio.I2SOut(board.I2S_BCLK, board.I2S_WS, board.I2S_DIN)
-elif hasattr(board, "D9") and hasattr(board, "D10") and hasattr(board, "D11"):
-    audio_bus = audiobusio.I2SOut(board.D9, board.D10, board.D11)
+
+fjPeriphs = adafruit_fruitjam.Peripherals.Peripherals(
+    audio_output=launcher_config["audio"].get("output", "headphone"), 
+    safe_volume_limit=launcher_config["audio"].get("volume_override_danger",12),
+    sample_rate=44100,
+    bit_depth=16,
+    i2c=board.I2C()
+)
+if not hasattr(board, "I2S_BCLK") and hasattr(board, "D9") and hasattr(board, "D10") and hasattr(board, "D11"):
+    fjPeriphs.audio = audiobusio.I2SOut(board.D9, board.D10, board.D11)
+
+# If volume was specified use it, otherwise use the fruitjam library default
+if "volume_override_danger" in launcher_config["audio"]:
+    fjPeriphs.volume = launcher_config["audio"]["volume_override_danger"]
+elif "volume" in launcher_config["audio"]:
+    fjPeriphs.volume = launcher_config["audio"]["volume"] # FruitJam vol (1-20)
+
+if fjPeriphs.audio is not None:
+    audio = Audio(fjPeriphs.audio, SOUND_EFFECTS)
 else:
-    audio_bus = None
-audio = Audio(audio_bus, SOUND_EFFECTS)
+    audio = None
 
-fb = picodvi.Framebuffer(320, 240, clk_dp=board.CKP, clk_dn=board.CKN,
-                                   red_dp=board.D0P, red_dn=board.D0N,
-                                   green_dp=board.D1P, green_dn=board.D1N,
-                                   blue_dp=board.D2P, blue_dn=board.D2N,
-                                   color_depth=8)
-display = framebufferio.FramebufferDisplay(fb)
+adafruit_fruitjam.Peripherals.request_display_config(320, 240, 8)
 
-game = Game(display, DATA_FILE, audio)
+game = Game(supervisor.runtime.display, DATA_FILE, audio)
 tick_length = SECOND_LENGTH / 1000 / TICKS_PER_SECOND
 while True:
     start = time.monotonic()
diff --git a/Metro/Metro_RP2350_Chips_Challenge/definitions.py b/Metro/Metro_RP2350_Chips_Challenge/definitions.py
@@ -1,65 +1,10 @@
 # SPDX-FileCopyrightText: 2025 Melissa LeBlanc-Williams
 #
 # SPDX-License-Identifier: MIT
-import json
-import time
-import board
 from micropython import const
-import adafruit_pathlib as pathlib
-import adafruit_tlv320
-
-# optional configuration file for speaker/headphone setting
-launcher_config = {}
-if pathlib.Path("/launcher.conf.json").exists():
-    with open("/launcher.conf.json", "r") as f:
-        launcher_config = json.load(f)
-
-# Check if DAC is connected
-if "I2C" in dir(board):
-    i2c = board.I2C()
-    for i in range(500): # try for 5 seconds
-        if i2c.try_lock():
-            break
-        time.sleep(0.01)
-    if 0x18 in i2c.scan():
-        tlv320_present = True
-    else:
-        tlv320_present = False
-    i2c.unlock()
-else:
-    tlv320_present = False
-
-if tlv320_present:
-    dac = adafruit_tlv320.TLV320DAC3100(i2c)
-
-    # set sample rate & bit depth
-    dac.configure_clocks(sample_rate=44100, bit_depth=16)
-
-    if "tlv320" in launcher_config:
-        if launcher_config["tlv320"].get("output") == "speaker":
-            # use speaker
-            dac.speaker_output = True
-            dac.dac_volume = launcher_config["tlv320"].get("volume",5)  # dB
-        else:
-            # use headphones
-            dac.headphone_output = True
-            dac.dac_volume = launcher_config["tlv320"].get("volume",0)  # dB
-    else:
-        # default to headphones
-        dac.headphone_output = True
-        dac.dac_volume = 0  # dB
-
-if tlv320_present:
-    _default_play_sounds = True
-else:
-    _default_play_sounds = False
-
-if "sound" in launcher_config:
-    if launcher_config["tlv320"].get("output") == "mute":
-        _default_play_sounds = False
 
 # Settings
-PLAY_SOUNDS = _default_play_sounds
+PLAY_SOUNDS = True
 
 # Timing Constants
 TICKS_PER_SECOND = const(20)
diff --git a/Metro/Metro_RP2350_Chips_Challenge/savestate.py b/Metro/Metro_RP2350_Chips_Challenge/savestate.py
@@ -32,7 +32,10 @@ def _mount_sd_card(self):
         except OSError:
             pass
 
-        self._card_detect = DigitalInOut(board.SD_CARD_DETECT)
+        try:
+            self._card_detect = DigitalInOut(board.SD_CARD_DETECT)
+        except ValueError:
+            return False
         self._card_detect.switch_to_input(pull=Pull.UP)
         if self._card_detect.value:
             return False
