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

Decadac #869

Merged
merged 3 commits into from
Nov 14, 2017
Merged

Decadac #869

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d6b2b
Merge pull request #1 from QCoDeS/master
ThorvaldLarsen Nov 6, 2017
77e8005
Slot number and label
ThorvaldLarsen Nov 13, 2017
1dfe033
Merge branch 'master' into Decadac
WilliamHPNielsen Nov 14, 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
6 changes: 3 additions & 3 deletions qcodes/instrument_drivers/Harvard/Decadac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def __init__(self, parent, name, channel, min_val=-5, max_val=5):
self.add_parameter("volt", get_cmd=partial(self._query_address, self._base_addr+9, 1),
get_parser=self._dac_code_to_v,
set_cmd=self._set_dac, set_parser=self._dac_v_to_code, vals=self._volt_val,
label="Voltage", unit="V")
label="channel {}".format(channel+self._slot*4), unit="V")
# The limit commands are used to sweep dac voltages. They are not safety features.
self.add_parameter("lower_ramp_limit", get_cmd=partial(self._query_address, self._base_addr+5),
get_parser=self._dac_code_to_v,
Expand Down Expand Up @@ -291,7 +291,7 @@ class DacSlot(InstrumentChannel, DacReader):
"""
A single DAC Slot of the DECADAC
"""
_SLOT_VAL = vals.Ints(0, 5)
_SLOT_VAL = vals.Ints(0, 4)
SLOT_MODE_DEFAULT = "Coarse"

def __init__(self, parent, name, slot, min_val=-5, max_val=5):
Expand Down Expand Up @@ -397,7 +397,7 @@ def __init__(self, name, address, min_val=-5, max_val=5, **kwargs):
# Create channels
channels = ChannelList(self, "Channels", DacChannel, snapshotable=False)
slots = ChannelList(self, "Slots", DacSlot)
for i in range(6): # Create the 6 DAC slots
for i in range(5): # Create the 5 DAC slots
slots.append(DacSlot(self, "Slot{}".format(i), i, min_val, max_val))
channels.extend(slots[i].channels)
slots.lock()
Expand Down