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

Merge pull request #3094 from RetiredWizard/chipsfixes

Browse source 
Generalizations on Metro_RP2350_Chips_Challenge  for Fruit Jam
This commit is contained in:
foamyguy 2025-08-05 09:35:13 -05:00 committed by GitHub
commit 5e539a6626
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 82 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
Fruit_Jam/Larsio_Paint_Music/sound_manager.py
View file

@ -141,37 +141,37 @@ class SoundManager:
try: try:
# Channel 1 samples # Channel 1 samples
self.samples = { self.samples = {
59: audiocore.WaveFile("/samples/larso_B3.wav"), # B3 59: audiocore.WaveFile("samples/larso_B3.wav"), # B3
60: audiocore.WaveFile("/samples/larso_C4.wav"), # C4 60: audiocore.WaveFile("samples/larso_C4.wav"), # C4
62: audiocore.WaveFile("/samples/larso_D4.wav"), # D4 62: audiocore.WaveFile("samples/larso_D4.wav"), # D4
64: audiocore.WaveFile("/samples/larso_E4.wav"), # E4 64: audiocore.WaveFile("samples/larso_E4.wav"), # E4
65: audiocore.WaveFile("/samples/larso_F4.wav"), # F4 65: audiocore.WaveFile("samples/larso_F4.wav"), # F4
67: audiocore.WaveFile("/samples/larso_G4.wav"), # G4 67: audiocore.WaveFile("samples/larso_G4.wav"), # G4
69: audiocore.WaveFile("/samples/larso_A4.wav"), # A4 69: audiocore.WaveFile("samples/larso_A4.wav"), # A4
71: audiocore.WaveFile("/samples/larso_B4.wav"), # B4 71: audiocore.WaveFile("samples/larso_B4.wav"), # B4
72: audiocore.WaveFile("/samples/larso_C5.wav"), # C5 72: audiocore.WaveFile("samples/larso_C5.wav"), # C5
74: audiocore.WaveFile("/samples/larso_D5.wav"), # D5 74: audiocore.WaveFile("samples/larso_D5.wav"), # D5
76: audiocore.WaveFile("/samples/larso_E5.wav"), # E5 76: audiocore.WaveFile("samples/larso_E5.wav"), # E5
77: audiocore.WaveFile("/samples/larso_F5.wav"), # F5 77: audiocore.WaveFile("samples/larso_F5.wav"), # F5
79: audiocore.WaveFile("/samples/larso_G5.wav"), # G5 79: audiocore.WaveFile("samples/larso_G5.wav"), # G5
} }
print("Loaded channel 1 WAV samples") print("Loaded channel 1 WAV samples")
# Load samples for channel 2 # Load samples for channel 2
self.heart_samples = { self.heart_samples = {
59: audiocore.WaveFile("/samples/musicnote16_B3.wav"), # B3 59: audiocore.WaveFile("samples/musicnote16_B3.wav"), # B3
60: audiocore.WaveFile("/samples/musicnote16_C4.wav"), # C4 60: audiocore.WaveFile("samples/musicnote16_C4.wav"), # C4
62: audiocore.WaveFile("/samples/musicnote16_D4.wav"), # D4 62: audiocore.WaveFile("samples/musicnote16_D4.wav"), # D4
64: audiocore.WaveFile("/samples/musicnote16_E4.wav"), # E4 64: audiocore.WaveFile("samples/musicnote16_E4.wav"), # E4
65: audiocore.WaveFile("/samples/musicnote16_F4.wav"), # F4 65: audiocore.WaveFile("samples/musicnote16_F4.wav"), # F4
67: audiocore.WaveFile("/samples/musicnote16_G4.wav"), # G4 67: audiocore.WaveFile("samples/musicnote16_G4.wav"), # G4
69: audiocore.WaveFile("/samples/musicnote16_A4.wav"), # A4 69: audiocore.WaveFile("samples/musicnote16_A4.wav"), # A4
71: audiocore.WaveFile("/samples/musicnote16_B4.wav"), # B4 71: audiocore.WaveFile("samples/musicnote16_B4.wav"), # B4
72: audiocore.WaveFile("/samples/musicnote16_C5.wav"), # C5 72: audiocore.WaveFile("samples/musicnote16_C5.wav"), # C5
74: audiocore.WaveFile("/samples/musicnote16_D5.wav"), # D5 74: audiocore.WaveFile("samples/musicnote16_D5.wav"), # D5
76: audiocore.WaveFile("/samples/musicnote16_E5.wav"), # E5 76: audiocore.WaveFile("samples/musicnote16_E5.wav"), # E5
77: audiocore.WaveFile("/samples/musicnote16_F5.wav"), # F5 77: audiocore.WaveFile("samples/musicnote16_F5.wav"), # F5
79: audiocore.WaveFile("/samples/musicnote16_G5.wav"), # G5 79: audiocore.WaveFile("samples/musicnote16_G5.wav"), # G5
} }
print("Loaded channel 2 WAV samples") print("Loaded channel 2 WAV samples")
@ -179,19 +179,19 @@ class SoundManager:
self.drum_samples = {} self.drum_samples = {}
try: try:
self.drum_samples = { self.drum_samples = {
59: audiocore.WaveFile("/samples/kick_01.wav"), 59: audiocore.WaveFile("samples/kick_01.wav"),
60: audiocore.WaveFile("/samples/kick_01.wav"), 60: audiocore.WaveFile("samples/kick_01.wav"),
62: audiocore.WaveFile("/samples/kick_01.wav"), 62: audiocore.WaveFile("samples/kick_01.wav"),
64: audiocore.WaveFile("/samples/snare_01.wav"), 64: audiocore.WaveFile("samples/snare_01.wav"),
65: audiocore.WaveFile("/samples/snare_01.wav"), 65: audiocore.WaveFile("samples/snare_01.wav"),
67: audiocore.WaveFile("/samples/snare_01.wav"), 67: audiocore.WaveFile("samples/snare_01.wav"),
69: audiocore.WaveFile("/samples/chat_01.wav"), 69: audiocore.WaveFile("samples/chat_01.wav"),
71: audiocore.WaveFile("/samples/chat_01.wav"), 71: audiocore.WaveFile("samples/chat_01.wav"),
72: audiocore.WaveFile("/samples/chat_01.wav"), 72: audiocore.WaveFile("samples/chat_01.wav"),
74: audiocore.WaveFile("/samples/ohat_01.wav"), 74: audiocore.WaveFile("samples/ohat_01.wav"),
76: audiocore.WaveFile("/samples/ohat_01.wav"), 76: audiocore.WaveFile("samples/ohat_01.wav"),
77: audiocore.WaveFile("/samples/crash_01.wav"), 77: audiocore.WaveFile("samples/crash_01.wav"),
79: audiocore.WaveFile("/samples/crash_01.wav"), 79: audiocore.WaveFile("samples/crash_01.wav"),
} }
print("Loaded channel 3 WAV samples (drums)") print("Loaded channel 3 WAV samples (drums)")
except Exception as e: except Exception as e:
@ -204,7 +204,7 @@ class SoundManager:
print(f"Error loading WAV samples: {e}") print(f"Error loading WAV samples: {e}")
# Fallback to basic samples if there's an error # Fallback to basic samples if there's an error
self.samples = { self.samples = {
65: audiocore.WaveFile("/samples/musicnote01.wav"), # Default sample 65: audiocore.WaveFile("samples/musicnote01.wav"), # Default sample
} }
self.heart_samples = self.samples # Use same samples as fallback self.heart_samples = self.samples # Use same samples as fallback
self.drum_samples = self.samples # Use same samples as fallback self.drum_samples = self.samples # Use same samples as fallback

28
Fruit_Jam/Larsio_Paint_Music/sprite_manager.py
View file

@ -80,21 +80,21 @@ class SpriteManager:
try: try:
# Load the Lars note bitmap for channel 1 notes # Load the Lars note bitmap for channel 1 notes
self.mario_head, self.mario_palette = adafruit_imageload.load( self.mario_head, self.mario_palette = adafruit_imageload.load(
"/sprites/lars_note.bmp" "sprites/lars_note.bmp"
) )
# Make the background color transparent (not just the same color) # Make the background color transparent (not just the same color)
self.mario_palette.make_transparent(0) self.mario_palette.make_transparent(0)
# Load the Heart note bitmap for channel 2 notes # Load the Heart note bitmap for channel 2 notes
self.heart_note, self.heart_palette = adafruit_imageload.load( self.heart_note, self.heart_palette = adafruit_imageload.load(
"/sprites/heart_note.bmp" "sprites/heart_note.bmp"
) )
# Make the background color transparent # Make the background color transparent
self.heart_palette.make_transparent(0) self.heart_palette.make_transparent(0)
# Load the Drum note bitmap for channel 3 notes # Load the Drum note bitmap for channel 3 notes
self.drum_note, self.drum_palette = adafruit_imageload.load( self.drum_note, self.drum_palette = adafruit_imageload.load(
"/sprites/drum_note.bmp" "sprites/drum_note.bmp"
) )
# Make the background color transparent # Make the background color transparent
self.drum_palette.make_transparent(0) self.drum_palette.make_transparent(0)
@ -102,18 +102,18 @@ class SpriteManager:
# Load the new sprites for channels 4, 5, and 6 # Load the new sprites for channels 4, 5, and 6
# Meatball for channel 4 # Meatball for channel 4
self.meatball_note, self.meatball_palette = adafruit_imageload.load( self.meatball_note, self.meatball_palette = adafruit_imageload.load(
"/sprites/meatball.bmp" "sprites/meatball.bmp"
) )
self.meatball_palette.make_transparent(0) self.meatball_palette.make_transparent(0)
# Star for channel 5 # Star for channel 5
self.star_note, self.star_palette = adafruit_imageload.load( self.star_note, self.star_palette = adafruit_imageload.load(
"/sprites/star.bmp" "sprites/star.bmp"
) )
self.star_palette.make_transparent(0) self.star_palette.make_transparent(0)
# Bot for channel 6 # Bot for channel 6
self.bot_note, self.bot_palette = adafruit_imageload.load("/sprites/bot.bmp") self.bot_note, self.bot_palette = adafruit_imageload.load("sprites/bot.bmp")
self.bot_palette.make_transparent(0) self.bot_palette.make_transparent(0)
except Exception as e: except Exception as e:
@ -171,45 +171,45 @@ class SpriteManager:
try: try:
# Load play button images # Load play button images
self.play_up, self.play_up_palette = adafruit_imageload.load( self.play_up, self.play_up_palette = adafruit_imageload.load(
"/sprites/play_up.bmp" "sprites/play_up.bmp"
) )
self.play_up_palette.make_transparent(0) self.play_up_palette.make_transparent(0)
self.play_down, self.play_down_palette = adafruit_imageload.load( self.play_down, self.play_down_palette = adafruit_imageload.load(
"/sprites/play_down.bmp" "sprites/play_down.bmp"
) )
self.play_down_palette.make_transparent(0) self.play_down_palette.make_transparent(0)
# Load stop button images # Load stop button images
self.stop_up, self.stop_up_palette = adafruit_imageload.load( self.stop_up, self.stop_up_palette = adafruit_imageload.load(
"/sprites/stop_up.bmp" "sprites/stop_up.bmp"
) )
self.stop_up_palette.make_transparent(0) self.stop_up_palette.make_transparent(0)
self.stop_down, self.stop_down_palette = adafruit_imageload.load( self.stop_down, self.stop_down_palette = adafruit_imageload.load(
"/sprites/stop_down.bmp" "sprites/stop_down.bmp"
) )
self.stop_down_palette.make_transparent(0) self.stop_down_palette.make_transparent(0)
# Load loop button images # Load loop button images
self.loop_up, self.loop_up_palette = adafruit_imageload.load( self.loop_up, self.loop_up_palette = adafruit_imageload.load(
"/sprites/loop_up.bmp" "sprites/loop_up.bmp"
) )
self.loop_up_palette.make_transparent(0) self.loop_up_palette.make_transparent(0)
self.loop_down, self.loop_down_palette = adafruit_imageload.load( self.loop_down, self.loop_down_palette = adafruit_imageload.load(
"/sprites/loop_down.bmp" "sprites/loop_down.bmp"
) )
self.loop_down_palette.make_transparent(0) self.loop_down_palette.make_transparent(0)
# Load clear button images # Load clear button images
self.clear_up, self.clear_up_palette = adafruit_imageload.load( self.clear_up, self.clear_up_palette = adafruit_imageload.load(
"/sprites/clear_up.bmp" "sprites/clear_up.bmp"
) )
self.clear_up_palette.make_transparent(0) self.clear_up_palette.make_transparent(0)
self.clear_down, self.clear_down_palette = adafruit_imageload.load( self.clear_down, self.clear_down_palette = adafruit_imageload.load(
"/sprites/clear_down.bmp" "sprites/clear_down.bmp"
) )
self.clear_down_palette.make_transparent(0) self.clear_down_palette.make_transparent(0)

33
Metro/Metro_RP2350_Chips_Challenge/code.py
View file

@ -21,20 +21,20 @@ from definitions import SECOND_LENGTH, TICKS_PER_SECOND
DATA_FILE = "CHIPS.DAT" DATA_FILE = "CHIPS.DAT"
SOUND_EFFECTS = { SOUND_EFFECTS = {
"BUTTON_PUSHED": "/sounds/pop2.wav", "BUTTON_PUSHED": "sounds/pop2.wav",
"DOOR_OPENED": "/sounds/door.wav", "DOOR_OPENED": "sounds/door.wav",
"ITEM_COLLECTED": "/sounds/blip2.wav", "ITEM_COLLECTED": "sounds/blip2.wav",
"BOOTS_STOLEN": "/sounds/strike.wav", "BOOTS_STOLEN": "sounds/strike.wav",
"WATER_SPLASH": "/sounds/water2.wav", "WATER_SPLASH": "sounds/water2.wav",
"TELEPORT": "/sounds/teleport.wav", "TELEPORT": "sounds/teleport.wav",
"CANT_MOVE": "/sounds/oof3.wav", "CANT_MOVE": "sounds/oof3.wav",
"CHIP_LOSES": "/sounds/bummer.wav", "CHIP_LOSES": "sounds/bummer.wav",
"LEVEL_COMPLETE": "/sounds/ditty1.wav", "LEVEL_COMPLETE": "sounds/ditty1.wav",
"IC_COLLECTED": "/sounds/click3.wav", "IC_COLLECTED": "sounds/click3.wav",
"BOMB_EXPLOSION": "/sounds/hit3.wav", "BOMB_EXPLOSION": "sounds/hit3.wav",
"SOCKET_SOUND": "/sounds/chimes.wav", "SOCKET_SOUND": "sounds/chimes.wav",
"TIME_LOW_TICK": "/sounds/click1.wav", "TIME_LOW_TICK": "sounds/click1.wav",
"TIME_UP": "/sounds/bell.wav" "TIME_UP": "sounds/bell.wav"
} }
displayio.release_displays() displayio.release_displays()
@ -45,7 +45,10 @@ dac.configure_clocks(sample_rate=44100, bit_depth=16)
dac.headphone_output = True dac.headphone_output = True
dac.headphone_volume = -15 # dB dac.headphone_volume = -15 # dB
audio_bus = audiobusio.I2SOut(board.D9, board.D10, board.D11) if hasattr(board, "I2S_BCLK"):
audio_bus = audiobusio.I2SOut(board.I2S_BCLK, board.I2S_WS, board.I2S_DIN)
else:
audio_bus = audiobusio.I2SOut(board.D9, board.D10, board.D11)
audio = Audio(audio_bus, SOUND_EFFECTS) audio = Audio(audio_bus, SOUND_EFFECTS)
fb = picodvi.Framebuffer(320, 240, clk_dp=board.CKP, clk_dn=board.CKN, fb = picodvi.Framebuffer(320, 240, clk_dp=board.CKP, clk_dn=board.CKN,

4
Metro/Metro_RP2350_Chips_Challenge/game.py
View file

@ -26,8 +26,8 @@ from savestate import SaveState
from microcontroller import nvm from microcontroller import nvm
# Colors must be colors in palette # Colors must be colors in palette
LARGE_FONT = bitmap_font.load_font("/fonts/Arial-Bold-10.pcf") LARGE_FONT = bitmap_font.load_font("fonts/Arial-Bold-10.pcf")
SMALL_FONT = bitmap_font.load_font("/fonts/Arial-8.pcf") SMALL_FONT = bitmap_font.load_font("fonts/Arial-8.pcf")
colors = { colors = {
"key_color": 0xAAFF00, # Light Green "key_color": 0xAAFF00, # Light Green

8
Metro/Metro_RP2350_Chips_Challenge/savestate.py
View file

@ -24,6 +24,14 @@ class SaveState:
self._sdcard = None self._sdcard = None
def _mount_sd_card(self): def _mount_sd_card(self):
# Check if the SD card is already mounted
try:
storage.getmount("/sd")
return True
except OSError:
pass
self._card_detect = DigitalInOut(board.SD_CARD_DETECT) self._card_detect = DigitalInOut(board.SD_CARD_DETECT)
self._card_detect.switch_to_input(pull=Pull.UP) self._card_detect.switch_to_input(pull=Pull.UP)
if self._card_detect.value: if self._card_detect.value: