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

Added extra type checking when applying pi camera config

Browse source
This commit is contained in:
Joel Collins 2019-08-08 10:14:57 +01:00
parent 57832f94a8
commit 3467fe7759
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openflexure_microscope/api/v1/blueprints/base.py
View file

@ -205,7 +205,8 @@ class ConfigAPI(MicroscopeView):
"""
payload = JsonPayload(request)
logging.debug("Updating settings from POST request.")
logging.debug("Updating settings from POST request:")
logging.debug(payload.json)
self.microscope.apply_config(payload.json)
self.microscope.save_config()

6
openflexure_microscope/camera/pi.py
View file

@ -173,15 +173,15 @@ class PiCameraStreamer(BaseCamera):
# Apply gains and let them settle
if 'analog_gain' in settings_dict:
logging.debug("Applying analog_gain: {}".format(settings_dict['analog_gain']))
set_analog_gain(self.camera, settings_dict['analog_gain'])
set_analog_gain(self.camera, float(settings_dict['analog_gain']))
if 'digital_gain' in settings_dict:
logging.debug("Applying digital_gain: {}".format(settings_dict['digital_gain']))
set_digital_gain(self.camera, settings_dict['digital_gain'])
set_digital_gain(self.camera, float(settings_dict['digital_gain']))
# Apply shutter speed
if 'shutter_speed' in settings_dict:
logging.debug("Applying shutter_speed: {}".format(settings_dict['shutter_speed']))
self.camera.shutter_speed = settings_dict['shutter_speed']
self.camera.shutter_speed = int(settings_dict['shutter_speed'])
time.sleep(0.2) # Let gains settle