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

Separated updating/writing from saving config

Browse source
This commit is contained in:
Joel Collins 2019-01-31 13:51:02 +00:00
parent 8087e4d445
commit e9d74c07e6
5 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/api/app.py
View file

@ -65,7 +65,7 @@ def attach_microscope():
logging.debug("First request made. Populating microscope with hardware...")
logging.debug("Creating camera object...")
api_camera = StreamingCamera(config=api_microscope.rc.asdict())
api_camera = StreamingCamera(config=api_microscope.rc.read())
logging.debug("Creating stage object...")
api_stage = Stage("/dev/ttyUSB0")

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

@ -172,7 +172,8 @@ class ConfigAPI(MicroscopeView):
print(payload.json)
self.microscope.apply_config(payload.json)
self.microscope.write_config(payload.json)
self.microscope.save_config()
return jsonify(self.microscope.config)