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

fixed gpio handling

Browse Source
This commit is contained in:
Balthasar Reuter
2015-06-18 01:04:57 +02:00
parent 21b35c6be4
commit eb7f846727
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
photobooth.py
View File

@@ -81,7 +81,7 @@ class PictureList:
class Photobooth: class Photobooth:
def __init__(self, picture_basename, picture_size, pose_time, display_time, def __init__(self, display_size, picture_basename, picture_size, pose_time, display_time,
trigger_channel, shutdown_channel, lamp_channel): trigger_channel, shutdown_channel, lamp_channel):
self.display = GuiModule('Photobooth', display_size) self.display = GuiModule('Photobooth', display_size)
self.pictures = PictureList(picture_basename) self.pictures = PictureList(picture_basename)
@@ -157,10 +157,10 @@ class Photobooth:
def handle_gpio_event(self, channel): def handle_gpio_event(self, channel):
"""Implements the actions taken for a GPIO event""" """Implements the actions taken for a GPIO event"""
if channel == gpio_trigger_channel: if channel == self.trigger_channel:
self.take_picture() self.take_picture()
elif channel == gpio_shutdown_channel: elif channel == self.shutdown_channel:
self.display.clear() self.teardown()
def handle_exception(self, msg): def handle_exception(self, msg):
"""Displays an error message and returns""" """Displays an error message and returns"""
@@ -255,7 +255,7 @@ class Photobooth:
################# #################
def main(): def main():
photobooth = Photobooth(picture_basename, image_size, pose_time, display_time, photobooth = Photobooth(picture_basename, display_size, image_size, pose_time, display_time,
gpio_trigger_channel, gpio_shutdown_channel, gpio_lamp_channel) gpio_trigger_channel, gpio_shutdown_channel, gpio_lamp_channel)
photobooth.run() photobooth.run()
photobooth.teardown() photobooth.teardown()