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

Moved status routes to instrument/state

Browse source
This commit is contained in:
Joel Collins 2020-01-29 17:43:52 +00:00
parent e9e2419fe4
commit 9b4bf4c8fc
16 changed files with 52 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/microscope.py
View file

@ -120,13 +120,13 @@ class Microscope:
else:
return False
# Create unified status
# Create unified state
@property
def state(self):
"""Dictionary of the basic microscope status.
"""Dictionary of the basic microscope state.
Return:
dict: Dictionary containing complete microscope status
dict: Dictionary containing complete microscope state
"""
state = {"camera": self.camera.state, "stage": self.stage.state}
return state
@ -216,7 +216,7 @@ class Microscope:
initial_configuration = self.configuration_file.load()
current_configuration = {
"@application": {
"application": {
"name": "openflexure_microscope",
"version": pkg_resources.get_distribution(
"openflexure_microscope"