rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed if statement for updating camera config.

Browse source
This commit is contained in:
Richard Bowman 2019-04-09 06:27:07 +00:00
parent e6ec800c21
commit 33f719894d
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
openflexure_microscope/camera/pi.py
View file

@ -185,14 +185,15 @@ class StreamingCamera(BaseCamera):
elif key == 'analog_gain': elif key == 'analog_gain':
set_analog_gain(self.camera, value) set_analog_gain(self.camera, value)
elif key == "shutter_speed": elif key == "shutter_speed":
# TODO: use types from CONFIG_KEYS? @jtc42
self.camera.shutter_speed = int(value) self.camera.shutter_speed = int(value)
else: else:
setattr(self.camera, key, value) # Write setting to camera setattr(self.camera, key, value) # Write setting to camera
# StreamingCamera parameters (applied via StreamingCamera config) # StreamingCamera parameters (applied via StreamingCamera config)
for key, value in config.items(): # For each provided setting for key, value in config.items(): # For each provided setting
if key in self.config.keys(): if key != 'picamera_settings': # We already handled this
if key != 'picamera_settings': # We already handled this if key not in CONFIG_KEYS.keys():
logging.warn("{} is not in the streaming camera settings dictionary - adding it.") logging.warn("{} is not in the streaming camera settings dictionary - adding it.")
#continue #TODO: filter settings somehow? #continue #TODO: filter settings somehow?
logging.debug("Setting parameter {}: {}".format(key, value)) logging.debug("Setting parameter {}: {}".format(key, value))