Merge remote-tracking branch 'origin/master' into v2.1.0-dev

This commit is contained in:
Joel Collins 2020-03-17 15:03:55 +00:00
commit a2914d8cf4
4 changed files with 27 additions and 18 deletions

View file

@ -6,7 +6,7 @@ from functools import wraps
def clean_rule(rule: str):
while rule[0] == "/":
rule = rule[1:]
return f"/{rule}"
return f"{rule}"
def build_gui_from_dict(gui_description, extension_object):

View file

@ -88,7 +88,11 @@ class Microscope:
stage_type = configuration["stage"].get("type")
stage_port = configuration["stage"].get("port")
if stage_type in ("SangaBoard", "SangaStage"):
self.stage = SangaStage(port=stage_port)
try:
self.stage = SangaStage(port=stage_port)
except Exception as e:
logging.error(e)
logging.warning("No compatible Sangaboard hardware found.")
### Fallbacks
if not self.camera: