Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few fixes from Francois for the glassman FR #225

Merged
merged 1 commit into from
Jan 4, 2020
Merged

A few fixes from Francois for the glassman FR #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions instruments/glassman/glassmanfr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 ##

Expand Down