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

Add "board" to all device states

Browse source
This commit is contained in:
Joel Collins 2019-09-19 17:22:04 +01:00
parent b0be4fc26a
commit 33af3bf48c
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openflexure_microscope/camera/base.py
View file

@ -120,7 +120,9 @@ class BaseCamera(metaclass=ABCMeta):
self.stream_timeout = 20 self.stream_timeout = 20
self.stream_timeout_enabled = False self.stream_timeout_enabled = False
self.state = {} self.state = {
"board": None
}
# TODO: Load/save these to config # TODO: Load/save these to config
self.paths = { self.paths = {

6
openflexure_microscope/camera/mock.py
View file

@ -25,7 +25,11 @@ class MockStreamer(BaseCamera):
BaseCamera.__init__(self) BaseCamera.__init__(self)
# Store state of PiCameraStreamer # Store state of PiCameraStreamer
self.state.update({"stream_active": False, "record_active": False}) self.state.update({
"stream_active": False,
"record_active": False,
"board": None
})
# Update config properties # Update config properties
self.image_resolution = (1312, 976) self.image_resolution = (1312, 976)

13
openflexure_microscope/camera/pi.py
View file

@ -66,9 +66,13 @@ class PiCameraStreamer(BaseCamera):
) #: :py:class:`picamera.PiCamera`: Picamera object ) #: :py:class:`picamera.PiCamera`: Picamera object
# Store state of PiCameraStreamer # Store state of PiCameraStreamer
self.state.update( self.state.update({
{"stream_active": False, "record_active": False, "preview_active": False} "stream_active": False,
) "record_active": False,
"preview_active": False,
"board": f"picamera_{self.camera.revision}",
})
# Reset variable states # Reset variable states
self.set_zoom(1.0) self.set_zoom(1.0)
@ -78,6 +82,9 @@ class PiCameraStreamer(BaseCamera):
self.numpy_resolution = (1312, 976) self.numpy_resolution = (1312, 976)
self.jpeg_quality = 75 self.jpeg_quality = 75
# Update board identifier
self.state.update({})
# Create an empty stream # Create an empty stream
self.stream = io.BytesIO() self.stream = io.BytesIO()