projects
/
pi-music.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5f48aad
)
Now using a dict to store the sounds
author
Pi user
<pi@njae.me.uk>
Mon, 21 Oct 2013 13:00:11 +0000
(14:00 +0100)
committer
Pi user
<pi@njae.me.uk>
Mon, 21 Oct 2013 13:00:11 +0000
(14:00 +0100)
glove.py
patch
|
blob
|
history
diff --git
a/glove.py
b/glove.py
index 5208c84d1a2aed2f42e4a53a2bdf8fb6fe19f921..22e8cbfb9ec27fb11eab18df89925c69bc06e60c 100644
(file)
--- a/
glove.py
+++ b/
glove.py
@@
-1,6
+1,5
@@
import pygame
import RPi.GPIO as gpio
import pygame
import RPi.GPIO as gpio
-import time
import logging
logger = logging.getLogger(__name__)
import logging
logger = logging.getLogger(__name__)
@@
-11,6
+10,9
@@
logger.addHandler(loggerFileHandler)
logger.setLevel(logging.WARNING)
logger.setLevel(logging.INFO)
logger.setLevel(logging.WARNING)
logger.setLevel(logging.INFO)
+gpio.setmode(gpio.BCM)
+pins = [25, 24, 18, 22]
+# pins = [25]
guitars = ['sounds/guitar1.wav',
'sounds/guitar2.wav',
guitars = ['sounds/guitar1.wav',
'sounds/guitar2.wav',
@@
-19,20
+21,19
@@
guitars = ['sounds/guitar1.wav',
'sounds/guitar5.wav']
pygame.mixer.init()
'sounds/guitar5.wav']
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()
logger.info("Started playing {0}".format(pins.index(pin)))
else:
logger.info("Started playing {0}".format(pins.index(pin)))
else:
- sounds[pin
s.index(pin)
].stop()
+ sounds[pin].stop()
logger.info("Stopped playing {0}".format(pins.index(pin)))
logger.info("Stopped playing {0}".format(pins.index(pin)))
-gpio.setmode(gpio.BCM)
-pins = [25, 24, 18, 22]
-# pins = [25]
-
for pin in pins:
gpio.setup(pin, gpio.IN)
gpio.add_event_detect(pin, gpio.BOTH, callback=handle_sound, bouncetime=200)
for pin in pins:
gpio.setup(pin, gpio.IN)
gpio.add_event_detect(pin, gpio.BOTH, callback=handle_sound, bouncetime=200)