From ad3ec1f9dd5fe8650d270639d8cc67b5846bd605 Mon Sep 17 00:00:00 2001 From: Steven Casagrande Date: Sat, 4 Jan 2020 16:21:22 -0500 Subject: [PATCH] A few fixes from Francois for the glassman FR --- instruments/glassman/glassmanfr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instruments/glassman/glassmanfr.py b/instruments/glassman/glassmanfr.py index 3069e93ec..51b26295d 100644 --- a/instruments/glassman/glassmanfr.py +++ b/instruments/glassman/glassmanfr.py @@ -96,7 +96,7 @@ def __init__(self, filelike): self.voltage_max = 50.0 * pq.kilovolt self.current_max = 6.0 * pq.milliamp self.polarity = +1 - self._device_timeout = True + self._device_timeout = False self._voltage = 0. * pq.volt self._current = 0. * pq.amp @@ -273,8 +273,8 @@ def device_timeout(self): def device_timeout(self, newval): if not isinstance(newval, bool): raise TypeError("Device timeout mode must be a boolean.") - self._device_timeout = newval self.query("C{}".format(int(not newval))) # Device acknowledges + self._device_timeout = newval # METHODS ##