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

Moved to collision-robust device name

Browse source
This commit is contained in:
Joel Collins 2020-01-09 20:04:22 +00:00
parent cf19939379
commit 8a282db12b
9 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/api/v2/views/actions/camera.py
View file

@ -49,7 +49,7 @@ class CaptureAPI(Resource):
"""
Create a new capture
"""
microscope = find_device("openflexure_microscope")
microscope = find_device("org.openflexure.microscope")
resize = args.get("resize", None)
if resize:
@ -97,7 +97,7 @@ class GPUPreviewStartAPI(Resource):
"""
Start the onboard GPU preview.
"""
microscope = find_device("openflexure_microscope")
microscope = find_device("org.openflexure.microscope")
payload = JsonResponse(request)
window = payload.param("window", default=[])
@ -120,6 +120,6 @@ class GPUPreviewStopAPI(Resource):
"""
Stop the onboard GPU preview.
"""
microscope = find_device("openflexure_microscope")
microscope = find_device("org.openflexure.microscope")
microscope.camera.stop_preview()
return jsonify(microscope.state)

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

@ -28,7 +28,7 @@ class MoveStageAPI(Resource):
"""
Move the microscope stage in x, y, z
"""
microscope = find_device("openflexure_microscope")
microscope = find_device("org.openflexure.microscope")
# Handle absolute positioning (calculate a relative move from current position and target)
if (args.get("absolute")) and (microscope.stage): # Only if stage exists
@ -62,7 +62,7 @@ class ZeroStageAPI(Resource):
Zero the stage coordinates.
Does not move the stage, but rather makes the current position read as [0, 0, 0]
"""
microscope = find_device("openflexure_microscope")
microscope = find_device("org.openflexure.microscope")
microscope.stage.zero_position()
return jsonify(microscope.status["stage"])