From: Pi user <pi@njae.me.uk>
Date: Mon, 21 Oct 2013 12:38:27 +0000 (+0100)
Subject: Callbacks working
X-Git-Url: https://git.njae.me.uk/?a=commitdiff_plain;h=5f48aad674e3d62b927783b91c74bebae9b73f6c;p=pi-music.git

Callbacks working
---

diff --git a/glove.py b/glove.py
index ec8dd5d..5208c84 100644
--- a/glove.py
+++ b/glove.py
@@ -18,45 +18,24 @@ guitars = ['sounds/guitar1.wav',
            'sounds/guitar4.wav',
            'sounds/guitar5.wav']
 
-pins = [25, 24, 18, 22]
-pins = [25]
-
 pygame.mixer.init()
 sounds = [pygame.mixer.Sound(g) for g in guitars]
 
-gpio.setmode(gpio.BCM)
-for pin in pins:
-    gpio.setup(pin, gpio.IN)
-
-last_states = [gpio.input(p) for p in pins]
-these_states = list(last_states)
-
-
 def handle_sound(pin):
-    if gpio.input(pin):
+    if not gpio.input(pin):
         sounds[pins.index(pin)].play()
         logger.info("Started playing {0}".format(pins.index(pin)))
     else:
         sounds[pins.index(pin)].stop()
         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)
-#    gpio.add_event_detect(pin, gpio.FALLING, callback=stop_sound, bouncetime=100)
 
 while True:
     pass
-
-#while True:
-#    these_states = [gpio.input(p) for p in pins]
-#    logger.debug("These: {0}, Last: {1}".format(these_states, last_states))
-#    for i in range(len(pins)):
-#        if these_states[i] and not last_states[i]:
-#            sounds[i].play()
-#            last_states[i] = these_states[i]
-#            logger.info("Started playing {0}".format(i))
-#        if not these_states[i] and last_states[i]:
-#            sounds[i].stop()
-#            last_states[i] = these_states[i]
-#            logger.info("Stopped playing {0}".format(i))