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

GPIO exit added

Browse Source
This commit is contained in:
Balthasar Reuter
2018-05-09 23:17:22 +02:00
parent ae43f34807
commit b30412960a
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
photobooth/Photobooth.py
View File

@@ -49,7 +49,7 @@ class Photobooth:
self._lampOff = lambda : self._gpio.lampOff(lamp)
self._gpio.setButton(config.getInt('Gpio', 'trigger_pin'), self.gpioTrigger)
self._gpio.setButton(config.getInt('Gpio', 'exit_pin'), self.teardown)
self._gpio.setButton(config.getInt('Gpio', 'exit_pin'), self.gpioExit)
else:
self._lampOn = lambda : None
self._lampOff = lambda : None
@@ -119,6 +119,9 @@ class Photobooth:
print('Camera already started')
self.initRun()
continue
elif str(event) == 'teardown':
self.teardown()
return -1
elif str(event) != 'triggered':
print('Unknown event received: ' + str(event))
raise RuntimeError('Unknown event received', str(event))
@@ -270,6 +273,11 @@ class Photobooth:
self._gpioTrigger()
def gpioExit(self):
self._send.send(gui.TeardownState())
def triggerOff(self):
self._lampOff()