aboutsummaryrefslogtreecommitdiff
path: root/qolab/hardware
diff options
context:
space:
mode:
Diffstat (limited to 'qolab/hardware')
-rw-r--r--qolab/hardware/scope/rigolds1054z.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/qolab/hardware/scope/rigolds1054z.py b/qolab/hardware/scope/rigolds1054z.py
index ccb85e7..a9ff9cb 100644
--- a/qolab/hardware/scope/rigolds1054z.py
+++ b/qolab/hardware/scope/rigolds1054z.py
@@ -23,6 +23,7 @@ class RigolDS1054z(ScopeSCPI):
self.resource.read_termination = "\n"
self.numberOfChannels = 4
self.maxRequiredPoints = 1200
+ self.resource.timeout = 1000 # timeout in ms
# desired number of points per channel, can return twice more
TimePerDiv = SCPI_PROPERTY(