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

Increased waiting time on 'no focus' to avoid nasty canon bug

Browse Source
This commit is contained in:
Balthasar Reuter
2015-07-01 00:36:47 +02:00
parent fa877a60bc
commit df9b615d7b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
camera.py
View File

@@ -51,7 +51,8 @@ class Camera_gPhoto:
if "ERROR" in output: if "ERROR" in output:
raise subprocess.CalledProcessError(returncode=0, cmd=cmd, output=output) raise subprocess.CalledProcessError(returncode=0, cmd=cmd, output=output)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if "Canon EOS Capture failed: 2019" in e.output: if "Canon EOS Capture failed: 2019" in e.output or
"Perhaps no focus" in e.output:
raise CameraException("Can't focus!\nMove a little bit!", True) raise CameraException("Can't focus!\nMove a little bit!", True)
elif "No camera found" in e.output: elif "No camera found" in e.output:
raise CameraException("No (supported) camera detected!", False) raise CameraException("No (supported) camera detected!", False)

2
photobooth.py
View File

@@ -320,7 +320,7 @@ class Photobooth:
self.display.clear() self.display.clear()
self.display.show_message(e.message) self.display.show_message(e.message)
self.display.apply() self.display.apply()
sleep(3) sleep(5)
else: else:
raise CameraException("Giving up! Please start again!", False) raise CameraException("Giving up! Please start again!", False)
else: else: