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

Merge branch 'master' into 'deltastage'

Browse source 
v1.1.2 fixes

See merge request openflexure/openflexure-microscope-server!33
This commit is contained in:
Joel Collins 2019-08-08 10:12:50 +00:00
commit be141b2be1
4 changed files with 12 additions and 5 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/api/v1/blueprints/plugins.py
View file

@ -13,6 +13,12 @@ class PluginSchemaAPI(MicroscopeView):
.. :quickref: Plugin; Get schemas
Returns an array of present plugin schemas (describing plugin user interfaces.)
Please note, this is *not* a list of all enabled plugins, only those with associated
user interface forms.
A complete list of enabled plugins can be found in the microscope state.
"""
out = self.microscope.plugin.schemas
return jsonify(out)