Skip to content

fix: Respond to issue #546 #552

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

Merged
giulioungaretti merged 5 commits into from
May 8, 2017
Merged

fix: Respond to issue #546 #552

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff2d6da
fix: Respond to issue #546
WilliamHPNielsen Mar 30, 2017
b478683
fix: Remove fine mode
WilliamHPNielsen Mar 30, 2017
f80bbc5
Merge branch 'master' into hotfix/Decadac
giulioungaretti May 4, 2017
3c83d91
Merge branch 'master' into hotfix/Decadac
giulioungaretti May 8, 2017
7639a81
Merge branch 'master' into hotfix/Decadac
giulioungaretti May 8, 2017
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
17 changes: 12 additions & 5 deletions qcodes/instrument_drivers/Harvard/Decadac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,23 @@ def __init__(self, name, port, slot, timeout=2, baudrate=9600,

self.add_parameter('mode',
label='Output mode',
set_cmd='B {}; M {};'.format(self.slot, '{}'),
vals=vals.Enum(0, 1),
set_cmd=partial(self._setmode, self.slot),
vals=vals.Enum(0, 2),
docstring="""
The operational mode of the slot.
0: output off, 1: output on.
0: output off,
2: 4-channel (low res) mode.
""")

# initialise hardware settings
self.mode.set(1)
self.mode.set(2)

def _setmode(slot, mode):
"""
set_cmd for the mode parameter
"""
self.visa_handle.write('B {}; M {};'.format(slot, mode)
self.visa_handle.read()

def _getoffset(self, n):
return self._offsets[n]
Expand Down Expand Up @@ -256,4 +264,3 @@ def _voltage2code(self, voltage, channel):
3: lambda x: 2**16/10*(x-2**-16+10)}
voltage_float = translationdict[self._voltranges[channel]](voltage)
return str(int(voltage_float))