adafruit-mirror/Fruit-Jam-OS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add launch.conf.json option speaker option (DOS fix)

Browse source
This commit is contained in:
RetiredWizard 2025-08-09 00:06:12 -04:00
parent 631d270860
commit 6d5634aed3
2 changed files with 41 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
builtin_apps/PyDOS/code.py
View file

@ -36,8 +36,9 @@ if implementation.name.upper() == "MICROPYTHON":
imp = "M" imp = "M"
elif implementation.name.upper() == "CIRCUITPYTHON": elif implementation.name.upper() == "CIRCUITPYTHON":
if not Pydos_ui: if not Pydos_ui:
from supervisor import runtime, reload from supervisor import runtime
from supervisor import reload
import storage import storage
import microcontroller import microcontroller
from adafruit_argv_file import argv_filename from adafruit_argv_file import argv_filename
@ -91,7 +92,10 @@ def PyDOS():
print("Starting Py-DOS... Type 'help' for help.") print("Starting Py-DOS... Type 'help' for help.")
if readonly: if readonly:
print("Warning: Py-DOS is running in read-only mode, some commands may not work.") print("Warning: Py-DOS is running in read-only mode, some commands may not work.")
if input("Press Enter to continue or 'R' to restart in read-write mode: ").upper() == 'R': ans = 'N'
while ans[:1].upper() != "C" and ans[:1].upper() != "R":
ans = input("Press 'C' to continue or 'R' to restart in read-write mode: ")
if ans[:1].upper() == "R":
print("\nNote: You can not modify files using the CIRCUITPY drive from a") print("\nNote: You can not modify files using the CIRCUITPY drive from a")
print("connected host computer in read-write mode. After restarting,") print("connected host computer in read-write mode. After restarting,")
print("you can use the 'readonly' command in PyDOS to return to read-only mode.\n") print("you can use the 'readonly' command in PyDOS to return to read-only mode.\n")
@ -100,6 +104,13 @@ def PyDOS():
with open(boot_args_file, "w") as f: with open(boot_args_file, "w") as f:
f.write('[false, "/code.py"]') f.write('[false, "/code.py"]')
microcontroller.reset() microcontroller.reset()
else:
break
elif ans[:1].upper() == "C":
break
else:
print("\nInvalid entry",ans[:1])
envVars["PATH"] = f'{sep};{sep}apps{sep}PyDOS;{sep}apps{sep}PyBasic' envVars["PATH"] = f'{sep};{sep}apps{sep}PyDOS;{sep}apps{sep}PyBasic'
envVars["PROMPT"] = "$P$G" envVars["PROMPT"] = "$P$G"

17
src/boot_animation.py
View file

@ -2,6 +2,7 @@
# #
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
import gc import gc
import json
import board import board
import supervisor import supervisor
@ -12,6 +13,12 @@ import math
import adafruit_tlv320 import adafruit_tlv320
from audiocore import WaveFile from audiocore import WaveFile
import audiobusio import audiobusio
import adafruit_pathlib as pathlib
launcher_config = {}
if pathlib.Path("launcher.conf.json").exists():
with open("launcher.conf.json", "r") as f:
launcher_config = json.load(f)
BOX_SIZE = (235, 107) BOX_SIZE = (235, 107)
TARGET_FPS = 70 TARGET_FPS = 70
@ -35,9 +42,19 @@ if ltv320_present:
# set sample rate & bit depth # set sample rate & bit depth
dac.configure_clocks(sample_rate=11030, bit_depth=16) dac.configure_clocks(sample_rate=11030, bit_depth=16)
if "sound" in launcher_config:
if launcher_config["sound"] == "speaker":
# use speaker
dac.speaker_output = True
dac.speaker_volume = -40
else:
# use headphones # use headphones
dac.headphone_output = True dac.headphone_output = True
dac.headphone_volume = -15 # dB dac.headphone_volume = -15 # dB
else:
# default to headphones
dac.headphone_output = True
dac.headphone_volume = -15 # dB
wave_file = open("/boot_animation/ada_fruitjam_boot_jingle.wav", "rb") wave_file = open("/boot_animation/ada_fruitjam_boot_jingle.wav", "rb")
wave = WaveFile(wave_file) wave = WaveFile(wave_file)