Commit 3467fe77 authored by Joel Collins's avatar Joel Collins
Browse files

Added extra type checking when applying pi camera config

parent 57832f94

openflexure_microscope/api/v1/blueprints/base.py

+2 −1
Original line number Diff line number Diff line
@@ -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()

openflexure_microscope/camera/pi.py

+3 −3
Original line number Diff line number Diff line
@@ -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