diff options
Diffstat (limited to 'lab_control/sds1000xe.py')
| -rw-r--r-- | lab_control/sds1000xe.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lab_control/sds1000xe.py b/lab_control/sds1000xe.py index a3ffe9c..ef6627c 100644 --- a/lab_control/sds1000xe.py +++ b/lab_control/sds1000xe.py @@ -12,20 +12,8 @@ class SDS1000XE(Oscilloscope): self._socket.connect((address, SDS1000XE.PORT)) self._socket.settimeout(SDS1000XE.TIMEOUT) - def measureAmplitude(self, channel: int) -> float: - return self._measure(channel, "AMPL") - - def measurePeakToPeak(self, channel: int) -> float: - return self._measure(channel, "PKPK") - - def measureRMS(self, channel: int) -> float: - return self._measure(channel, "RMS") - - def measureFrequency(self, channel: int) -> float: - return self._measure(channel, "FREQ") - def _measure(self, channel: int, code: str) -> float: - assert channel in SDS1000XE.AVAILABLE_CHANNELS + assert channel in SDS1000XE.AVAILABLE_CHANNELS, "SDS1000X-E: Invalid channel {channel}" query = f"C{channel}:PAVA? {code}\r\n" self._socket.sendall(query.encode()) @@ -40,3 +28,15 @@ class SDS1000XE(Oscilloscope): return measurement + def measureAmplitude(self, channel: int) -> float: + return self._measure(channel, "AMPL") + + def measurePeakToPeak(self, channel: int) -> float: + return self._measure(channel, "PKPK") + + def measureRMS(self, channel: int) -> float: + return self._measure(channel, "RMS") + + def measureFrequency(self, channel: int) -> float: + return self._measure(channel, "FREQ") + |