From 5a22d0d30869a6f8a703aa710ce08e772e29a58c Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Fri, 24 May 2019 16:47:04 +0100 Subject: [PATCH] Re-added timeout parameters (previous commit broke) --- openflexure_microscope/camera/base.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openflexure_microscope/camera/base.py b/openflexure_microscope/camera/base.py index ef85d0e6..3af1e7b5 100644 --- a/openflexure_microscope/camera/base.py +++ b/openflexure_microscope/camera/base.py @@ -98,6 +98,8 @@ class BaseCamera(object): access to stage hardware frame (bytes): Current frame is stored here by background thread last_access (time): Time of last client access to the camera + stream_timeout (int): Number of inactive seconds before timing out the stream + stream_timeout_enabled (bool): Enable or disable timing out the stream state (dict): Dictionary for capture state config (dict): Dictionary of base camera config paths (dict): Dictionary of capture paths @@ -114,6 +116,9 @@ class BaseCamera(object): self.last_access = 0 self.event = CameraEvent() + self.stream_timeout = 20 + self.stream_timeout_enabled = False + self.state = {} self.config = {} self.paths = {