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

Merge branch 'master' of https://gitlab.com/openflexure/openflexure-microscope-server into master

Browse source
This commit is contained in:
Joel Collins 2020-10-28 17:32:14 +00:00
commit 9dd8004984
5 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openflexure_microscope/api/default_extensions/autofocus.py
View file

@ -325,7 +325,7 @@ class MoveAndMeasureAPI(ActionView):
if microscope.has_real_stage():
# Acquire microscope lock with 1s timeout
with microscope.lock(timeout=1):
with microscope.camera.lock, microscope.stage.lock:
return move_and_measure(microscope, dz=args.get("dz"))
else: