summaryrefslogtreecommitdiffstats
path: root/lab_control/sds1000xe.py
diff options
context:
space:
mode:
Diffstat (limited to 'lab_control/sds1000xe.py')
-rw-r--r--lab_control/sds1000xe.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/lab_control/sds1000xe.py b/lab_control/sds1000xe.py
index c0654e0..a3ffe9c 100644
--- a/lab_control/sds1000xe.py
+++ b/lab_control/sds1000xe.py
@@ -5,12 +5,11 @@ from lab_control.oscilloscope import Oscilloscope
class SDS1000XE(Oscilloscope):
PORT = 5025
TIMEOUT = 0.2
-
AVAILABLE_CHANNELS = range(1, 5)
- def __init__(self, ip):
+ def __init__(self, address):
self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- self._socket.connect((ip, SDS1000XE.PORT))
+ self._socket.connect((address, SDS1000XE.PORT))
self._socket.settimeout(SDS1000XE.TIMEOUT)
def measureAmplitude(self, channel: int) -> float:
@@ -28,7 +27,7 @@ class SDS1000XE(Oscilloscope):
def _measure(self, channel: int, code: str) -> float:
assert channel in SDS1000XE.AVAILABLE_CHANNELS
- query = f"C{channel}:PAVA? {code}"
+ query = f"C{channel}:PAVA? {code}\r\n"
self._socket.sendall(query.encode())
try: