adafruit-mirror/Adafruit_Learning_System_Guides
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

eliminate app dictionay, use only root config file and fix tlv320 variable name

Browse source
This commit is contained in:
RetiredWizard 2025-08-17 15:54:20 -04:00
parent 5c59c048bd
commit 83d33d6641
2 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Fruit_Jam/Larsio_Paint_Music/sound_manager.py
View file

@ -66,12 +66,8 @@ class SoundManager:
self.audio = audiopwmio.PWMAudioOut(board.D10)
else: # i2s
# optional configuration file for speaker/headphone setting
# check current directory first and then root directory
launcher_config = {}
if pathlib.Path("launcher.conf.json").exists():
with open("launcher.conf.json", "r") as f:
launcher_config = json.load(f)
elif pathlib.Path("/launcher.conf.json").exists():
if pathlib.Path("/launcher.conf.json").exists():
with open("/launcher.conf.json", "r") as f:
launcher_config = json.load(f)
@ -110,23 +106,24 @@ class SoundManager:
# Initialize TLV320
self.tlv = adafruit_tlv320.TLV320DAC3100(i2c)
self.tlv.reset()
# set sample rate & bit depth
self.tlv.configure_clocks(sample_rate=11025, bit_depth=16)
if "sound" in launcher_config:
if launcher_config["sound"] == "speaker":
if "tlv320" in launcher_config:
if launcher_config["tlv320"].get("output") == "speaker":
# use speaker
self.tlv.speaker_output = True
self.tlv.speaker_volume = -60
self.tlv.dac_volume = launcher_config["tlv320"].get("volume",5) # dB
else:
# use headphones
self.tlv.headphone_output = True
self.tlv.headphone_volume = -15 # dB
self.tlv.dac_volume = launcher_config["tlv320"].get("volume",0) # dB
else:
# default to headphones
self.tlv.headphone_output = True
self.tlv.headphone_volume = -15 # dB
self.tlv.dac_volume = 0 # dB
# Setup I2S audio output - important to do this AFTER configuring the DAC
self.audio = audiobusio.I2SOut(

32
Metro/Metro_RP2350_Chips_Challenge/definitions.py
View file

@ -8,12 +8,9 @@ from micropython import const
import adafruit_pathlib as pathlib
import adafruit_tlv320
# optional configuration file for speaker/headphone setting, check current and root directory
# 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)
elif pathlib.Path("/launcher.conf.json").exists():
if pathlib.Path("/launcher.conf.json").exists():
with open("/launcher.conf.json", "r") as f:
launcher_config = json.load(f)
@ -25,40 +22,41 @@ if "I2C" in dir(board):
break
time.sleep(0.01)
if 0x18 in i2c.scan():
ltv320_present = True
tlv320_present = True
else:
ltv320_present = False
tlv320_present = False
i2c.unlock()
else:
ltv320_present = False
tlv320_present = False
if ltv320_present:
if tlv320_present:
dac = adafruit_tlv320.TLV320DAC3100(i2c)
dac.reset()
# set sample rate & bit depth
dac.configure_clocks(sample_rate=44100, bit_depth=16)
if "sound" in launcher_config:
if launcher_config["sound"] == "speaker":
if "tlv320" in launcher_config:
if launcher_config["tlv320"].get("output") == "speaker":
# use speaker
dac.speaker_output = True
dac.speaker_volume = -40
elif launcher_config["sound"] != "mute":
dac.dac_volume = launcher_config["tlv320"].get("volume",5) # dB
else:
# use headphones
dac.headphone_output = True
dac.headphone_volume = -15 # dB
dac.dac_volume = launcher_config["tlv320"].get("volume",0) # dB
else:
# default to headphones
dac.headphone_output = True
dac.headphone_volume = -15 # dB
dac.dac_volume = 0 # dB
if ltv320_present:
if tlv320_present:
_default_play_sounds = True
else:
_default_play_sounds = False
if "sound" in launcher_config:
if launcher_config["sound"] == "mute":
if launcher_config["tlv320"].get("output") == "mute":
_default_play_sounds = False
# Settings