diff options
Diffstat (limited to 'lab_control/sds1000xe.py')
| -rw-r--r-- | lab_control/sds1000xe.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lab_control/sds1000xe.py b/lab_control/sds1000xe.py index ef6627c..551c9ef 100644 --- a/lab_control/sds1000xe.py +++ b/lab_control/sds1000xe.py @@ -4,7 +4,7 @@ from lab_control.oscilloscope import Oscilloscope class SDS1000XE(Oscilloscope): PORT = 5025 - TIMEOUT = 0.2 + TIMEOUT = 1.0 AVAILABLE_CHANNELS = range(1, 5) def __init__(self, address): @@ -21,7 +21,7 @@ class SDS1000XE(Oscilloscope): try: # TODO add code to regex response = self._socket.recv(4096).decode() - m = re.search(r"C(?P<responseChannel>\d):PAVA .+,(?P<rawMeasurement>.+)V", response) + m = re.search(r"C(?P<responseChannel>\d):PAVA .+,(?P<rawMeasurement>[0-9.E+-]+)\w+", response) measurement = float(m.group("rawMeasurement")) except TimeoutError as e: measurement = None |