projects
/
pi-music.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged in use of dict
[pi-music.git]
/
glove.py
diff --git
a/glove.py
b/glove.py
index 942d83bb0b1b7bfb0e3fd65bed58cbf284f5cddc..b2f2075aedd0221278856edaad8e1856933b97d1 100644
(file)
--- a/
glove.py
+++ b/
glove.py
@@
-1,23
+1,25
@@
import pygame
import RPi.GPIO as gpio
import pygame
import RPi.GPIO as gpio
+gpio.setmode(gpio.BCM)
+pins = [25, 24, 18, 22]
+
guitars = ['sounds/guitar1.wav',
'sounds/guitar2.wav',
'sounds/guitar3.wav',
guitars = ['sounds/guitar1.wav',
'sounds/guitar2.wav',
'sounds/guitar3.wav',
- 'sounds/guitar4.wav',
- 'sounds/guitar5.wav']
+ 'sounds/guitar4.wav']
pygame.mixer.init()
pygame.mixer.init()
-sounds = [pygame.mixer.Sound(g) for g in guitars]
+
+sounds = {}
+for pin, wav in zip(pins, guitars):
+ sounds[pin] = pygame.mixer.Sound(wav)
def handle_sound(pin):
if not gpio.input(pin):
def handle_sound(pin):
if not gpio.input(pin):
- sounds[pin
s.index(pin)
].play()
+ sounds[pin].play()
else:
else:
- sounds[pins.index(pin)].stop()
-
-gpio.setmode(gpio.BCM)
-pins = [25, 24, 18, 22]
+ sounds[pin].stop()
for pin in pins:
gpio.setup(pin, gpio.IN)
for pin in pins:
gpio.setup(pin, gpio.IN)