Skip to content

Commit

Permalink
Merge pull request #63 from qdev-dk/Adriaan_working_branc
Browse files Browse the repository at this point in the history
Negative delay warning fix for IVVI driver
  • Loading branch information
AdriaanRol committed Apr 6, 2016
2 parents 71c08b3 + 46d4818 commit 02771f6
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions qcodes/instrument_drivers/QuTech/IVVI.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,17 @@ def __init__(self, name, address, reset=False, numdacs=16):
get_cmd=self._get_dacs)

for i in range(numdacs):
self.add_parameter('dac{}'.format(i+1),
label='Dac {} (mV)'.format(i+1),
units='mV',
get_cmd=self._gen_ch_get_func(self._get_dac, i+1),
set_cmd=self._gen_ch_set_func(self._set_dac, i+1),
vals=vals.Numbers(-2000, 2000),
sweep_step=10,
sweep_delay=.1,
max_val_age=10)
self.add_parameter(
'dac{}'.format(i+1),
label='Dac {} (mV)'.format(i+1),
units='mV',
get_cmd=self._gen_ch_get_func(self._get_dac, i+1),
set_cmd=self._gen_ch_set_func(self._set_dac, i+1),
vals=vals.Numbers(-2000, 2000),
sweep_step=10,
sweep_delay=.1,
max_sweep_delay=.2,
max_val_age=10)

self._update_time = 5 # 5 seconds
self._time_last_update = 0 # ensures first call will always update
Expand Down

0 comments on commit 02771f6

Please sign in to comment.