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

Flipped to explicit finite lock timeouts

Browse source
This commit is contained in:
Joel Collins 2020-06-29 09:03:27 +01:00
parent 832a9adbe3
commit 9cecb477cb
6 changed files with 35 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
openflexure_microscope/api/v2/views/actions/stage.py
View file

@ -45,8 +45,8 @@ class MoveStageAPI(ActionView):
# Move if stage exists
if microscope.stage:
# Explicitally acquire lock
with microscope.stage.lock:
# Explicitally acquire lock with 1s timeout
with microscope.stage.lock(timeout=1):
microscope.stage.move_rel(position)
else:
logging.warning("Unable to move. No stage found.")
@ -62,7 +62,9 @@ class ZeroStageAPI(ActionView):
Does not move the stage, but rather makes the current position read as [0, 0, 0]
"""
microscope = find_component("org.openflexure.microscope")
microscope.stage.zero_position()
with microscope.stage.lock(timeout=1):
microscope.stage.zero_position()
# TODO: Make schema for microscope state
return microscope.state["stage"]