Merge remote-tracking branch 'origin/master' into v2.1.0-dev
This commit is contained in:
commit
a2914d8cf4
4 changed files with 27 additions and 18 deletions
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue