Skip to content

Bug fixes for window castle code #1166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 13, 2020
Merged

Bug fixes for window castle code #1166

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5dd0b2d
Castle code bug fixes
firepixie Jul 9, 2020
707edbf
Merge branch 'master' of https://github.com/firepixie/Adafruit_Learni…
firepixie Jul 9, 2020
4a35534
Bottle castle bug fixes
firepixie Jul 13, 2020
728cece
with pylint done
firepixie Jul 13, 2020
bca0291
Merge branch 'master' into master
TheKitty Jul 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 25 additions & 21 deletions Glowing_Bottle_Castle/code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
mpr121 = adafruit_mpr121.MPR121(i2c)

# Demo MODE LED Animations ------------------------------------------------------
rainbow = Rainbow(pixels, speed=0.1, period=10, name="rainbow", step=1)
rainbow = Rainbow(pixels, speed=0, period=10, name="rainbow", step=1)
rainbow_chase = RainbowChase(pixels, speed=0, size=5, spacing=10)
chase = Chase(pixels, speed=0.1, color=RED, size=1, spacing=6)
rainbow_comet = RainbowComet(pixels, speed=0.01, tail_length=60, bounce=True)
Expand Down Expand Up @@ -102,21 +102,22 @@ def go_dark():
audio = AudioOut(board.SPEAKER)

tracks = (
WaveFile(open("sounds/F1.wav", "rb")), # 0
WaveFile(open("sounds/G1.wav", "rb")), # 1
WaveFile(open("sounds/A1.wav", "rb")), # 2
WaveFile(open("sounds/Bb1.wav", "rb")), # 3
WaveFile(open("sounds/C1.wav", "rb")), # 4
WaveFile(open("sounds/D2.wav", "rb")), # 5
WaveFile(open("sounds/E2.wav", "rb")), # 6
WaveFile(open("sounds/F2.wav", "rb")), # 7
WaveFile(open("sounds/G2.wav", "rb")), # 8
WaveFile(open("sounds/A2.wav", "rb")), # 9
WaveFile(open("sounds/Bb2.wav", "rb")), # 10
WaveFile(open("sounds/C2.wav", "rb")), # 11
WaveFile(open("sounds/D3.wav", "rb")), # 12
WaveFile(open("sounds/E3.wav", "rb")), # 13
WaveFile(open("sounds/F3.wav", "rb")), # 13
WaveFile(open("sounds/F2.wav", "rb")), # 0
WaveFile(open("sounds/G2.wav", "rb")), # 1
WaveFile(open("sounds/A2.wav", "rb")), # 2
WaveFile(open("sounds/Bb2.wav", "rb")), # 3
WaveFile(open("sounds/C2.wav", "rb")), # 4
WaveFile(open("sounds/D3.wav", "rb")), # 5
WaveFile(open("sounds/E3.wav", "rb")), # 6
WaveFile(open("sounds/F3.wav", "rb")), # 7
WaveFile(open("sounds/F1.wav", "rb")), # 7
WaveFile(open("sounds/G1.wav", "rb")), # 8
WaveFile(open("sounds/A1.wav", "rb")), # 9
WaveFile(open("sounds/Bb1.wav", "rb")), # 10
WaveFile(open("sounds/C1.wav", "rb")), # 11
WaveFile(open("sounds/D2.wav", "rb")), # 12
WaveFile(open("sounds/E2.wav", "rb")), # 13
WaveFile(open("sounds/F2.wav", "rb")), # 13
)

# Add or change song track names here. They will play in the order listed.
Expand Down Expand Up @@ -146,7 +147,7 @@ def play_bottle(bottle_id, is_octave):
light_up(bottle_id)
if is_octave:
audio.play(tracks[bottle_id + 7]) # Start playing sound
light_up(9)
light_up(8)
else:
audio.play(tracks[bottle_id]) # Start playing sound
pixels.show()
Expand All @@ -157,6 +158,7 @@ def check_buttons(touched):
''' check to see if buttons have been pressed'''
global MODE, LAST_BUTTON
octave = touched[11]
off = touched[9]
if octave:
light_up(8)
for pad in range(1, 9):
Expand All @@ -165,7 +167,7 @@ def check_buttons(touched):
if pad != LAST_BUTTON and touched[pad]:
LAST_BUTTON = pad
play_bottle(pad - 1, octave)
if touched[9]:
if off:
MODE = 9
go_dark()
if touched[10]:
Expand All @@ -180,10 +182,12 @@ def check_buttons(touched):
while True:
# Idle mode: Play a Rainbow animation when nothing's being touched
if MODE == 0:
pixels.brightness = 1 #rainbow mode is much brighter than the other modes, so adjust here
pixels.brightness = 0.3 #rainbow mode is much brighter than the other modes, so adjust here
rainbow.animate()
for button in buttons:
button.update()
check_buttons(mpr121.touched_pins)
time.sleep(0.1)
for i in range(12):
if buttons[i].fell:
MODE = 1
Expand All @@ -210,8 +214,8 @@ def check_buttons(touched):
else:
MODE = 0 # Return to idle mode
if MODE == 9: # MODE 9 is "off" mode, listening for a new button press to wake up.
for button in buttons:
button.update()
# for button in buttons:
# button.update()
for i in range(12):
if buttons[i].fell:
MODE = 1