Fixed camera settings

Since splitting the camera config into a separate YAML file, we've broken
the ability to change the camera's configuration via the API (or at any time
except when the camera is set up, I think).  This (mostly) fixes that, though
I get type errors that I've had to work around (e.g. when setting
shutter_speed), see `pi.py`
This commit is contained in:
Richard Bowman 2019-04-08 22:41:12 +01:00
parent e90eb7c2d4
commit e6ec800c21
4 changed files with 20 additions and 7 deletions

View file

@ -192,7 +192,7 @@ class Microscope(object):
# If attached to a camera
if self.camera:
# Update camera config
self.camera.config.update(config)
self.camera.apply_config(config)
# If attached to a stage
# TODO: Convert stage settings into a config expansion