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

Merge branch 'deltastage' into 'master'

Browse source 
Deltastage

See merge request openflexure/openflexure-microscope-server!69
This commit is contained in:
Joel Collins 2020-09-09 15:18:25 +00:00
commit 5ca386bde1
3 changed files with 77 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openflexure_microscope/microscope.py
View file

@ -12,7 +12,7 @@ from openflexure_microscope.captures import CaptureManager
from openflexure_microscope.stage.mock import MissingStage
from openflexure_microscope.camera.mock import MissingCamera
from openflexure_microscope.stage.sanga import SangaStage
from openflexure_microscope.stage.sanga import SangaStage, SangaDeltaStage
try:
from openflexure_microscope.camera.pi import PiCameraStreamer
@ -111,10 +111,18 @@ class Microscope:
stage_port = configuration["stage"].get("port")
if stage_type in ("SangaBoard", "SangaStage"):
try:
logging.info("Trying SangaStage")
self.stage = SangaStage(port=stage_port)
except Exception as e:
logging.error(e)
logging.warning("No compatible Sangaboard hardware found.")
elif stage_type in ("SangaDeltaStage"):
try:
logging.info("Trying SangaDeltaStage")
self.stage = SangaDeltaStage(port=stage_port)
except Exception as e:
logging.error(e)
logging.warning("No compatible Sangaboard hardware found.")
logging.info("Handling fallbacks")
### Fallbacks