felix/photobooth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Scope mistake

Browse Source
This commit is contained in:
Balthasar Reuter
2015-05-30 14:16:07 +02:00
parent 80238bbe38
commit 09961591fc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
photobooth.py
View File

@@ -46,6 +46,9 @@ image_basename = datetime.now().strftime("%Y-%m-%d/pic")
# GPIO channel of switch to take pictures # GPIO channel of switch to take pictures
gpio_trigger_channel = 23 # pin 16 in all Raspi-Versions gpio_trigger_channel = 23 # pin 16 in all Raspi-Versions
# PyGame event used to detect GPIO triggers
gpio_trigger_event = pygame.USEREVENT
# Waiting time in seconds for posing # Waiting time in seconds for posing
pose_time = 5 pose_time = 5
@@ -158,7 +161,7 @@ class GUI_PyGame:
if event.type == pygame.QUIT: return if event.type == pygame.QUIT: return
elif event.type == pygame.KEYDOWN: handle_keypress(event.key) elif event.type == pygame.KEYDOWN: handle_keypress(event.key)
elif event.type == pygame.MOUSEBUTTONUP: handle_mousebutton(event.button, event.pos) elif event.type == pygame.MOUSEBUTTONUP: handle_mousebutton(event.button, event.pos)
elif event.type == pygame.USEREVENT: handle_gpio_event(event.channel) elif event.type == gpio_trigger_event: handle_gpio_event(event.channel)
# Ignore all input that happened inbetween # Ignore all input that happened inbetween
# eventmodule.clear() # eventmodule.clear()
eventmodule.get() eventmodule.get()
@@ -318,7 +321,8 @@ def setup_gpio():
def handle_gpio(channel): def handle_gpio(channel):
"""Interrupt handler for GPIO events""" """Interrupt handler for GPIO events"""
eventmodule.post(eventmodule.Event(USEREVENT, channel=channel)) print("Button pressed")
eventmodule.post(eventmodule.Event(gpio_trigger_event, channel=channel))
def teardown(exit_code=0): def teardown(exit_code=0):
display.teardown() display.teardown()