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

Merge branch 'geometry-change-bug-fixes' into 'master'

Browse source 
Geometry change bug fixes

See merge request openflexure/openflexure-microscope-server!78
This commit is contained in:
Joel Collins 2020-10-27 17:17:58 +00:00
commit f9da19fb7f
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
openflexure_microscope/microscope.py
View file

@ -144,6 +144,9 @@ class Microscope:
try:
logging.info("Trying SangaStage")
self.stage = SangaStage(port=stage_port)
logging.info("Saving new SangaStage type configuration")
configuration["stage"]["type"] = stage_type
self.configuration_file.save(configuration)
except Exception as e: # pylint: disable=W0703
logging.error(e)
logging.warning("No compatible Sangaboard hardware found.")
@ -151,17 +154,15 @@ class Microscope:
try:
logging.info("Trying SangaDeltaStage")
self.stage = SangaDeltaStage(port=stage_port)
logging.info("Saving new SangaDeltaStage type configuration")
configuration["stage"]["type"] = stage_type
self.configuration_file.save(configuration)
except Exception as e: # pylint: disable=W0703
logging.error(e)
logging.warning("No compatible Sangaboard hardware found.")
else:
logging.warning("The stage type is incorrectly defined.")
logging.info("Saving new stage type configuration")
configuration["stage"]["type"] = stage_type
self.configuration_file.save(configuration)
def has_real_stage(self) -> bool:
"""
Check if a real (non-mock) stage is currently attached.