Merge branch 'gain-exposure-settings' into 'master'

Fixed camera's read_config method

See merge request openflexure/openflexure-microscope-server!11
This commit is contained in:
Joel Collins 2019-04-14 09:04:03 +00:00
commit 793a3f0b63

View file

@ -131,7 +131,7 @@ class StreamingCamera(BaseCamera):
}
# PiCamera parameters (obtained directly from PiCamera object)
for key, _ in self.config['picamera_settings'].items():
for key, _ in CONFIG_KEYS['picamera_settings'].items():
try:
value = getattr(self.camera, key)
conf_dict['picamera_settings'][key] = value