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

Changed locks to 1s default

Browse source
This commit is contained in:
Joel Collins 2020-06-25 16:48:17 +01:00
parent f60d85fa89
commit 2435842ff6
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/camera/pi.py
View file

@ -195,7 +195,7 @@ class PiCameraStreamer(BaseCamera):
logging.debug("PiCameraStreamer: Applying config:")
logging.debug(config)
with self.lock:
with self.lock(timeout=None):
# Apply valid config params to Picamera object
if not self.record_active: # If not recording a video
@ -301,7 +301,7 @@ class PiCameraStreamer(BaseCamera):
"""
Change the camera zoom, handling re-centering and scaling.
"""
with self.lock:
with self.lock(timeout=None):
self.zoom_value = float(zoom_value)
if self.zoom_value < 1:
self.zoom_value = 1
@ -448,7 +448,7 @@ class PiCameraStreamer(BaseCamera):
resolution ((int, int)): Resolution to set the camera to, before starting recording.
Defaults to `self.stream_resolution`.
"""
with self.lock:
with self.lock(timeout=None):
# If stream object was destroyed
if not hasattr(self, "stream"):
self.stream = io.BytesIO() # Create a stream object