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

Fixed picamera setup

Browse source
This commit is contained in:
Joel Collins 2020-01-29 16:16:09 +00:00
parent 7458d278d8
commit 265eed7bfa
4 changed files with 18 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/api/default_extensions/picamera_autocalibrate/extension.py
View file

@ -21,8 +21,8 @@ def recalibrate(microscope):
"""
scamera = microscope.camera
with scamera.lock:
assert not scamera.status["record_active"], "Can't recalibrate while recording!"
streaming = scamera.status["stream_active"]
assert not scamera.record_active, "Can't recalibrate while recording!"
streaming = scamera.stream_active
if streaming:
logging.info("Stopping stream before recalibration")
scamera.stop_stream_recording(resolution=(640, 480))

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

@ -53,7 +53,7 @@ class MoveStageAPI(View):
logging.warning("Unable to move. No stage found.")
# TODO: Make schema for microscope status
return jsonify(microscope.status["stage"]["position"])
return jsonify(microscope.state["stage"]["position"])
@ThingAction