From ac89a7123314b09d94cf7863c22645f3e60af66a Mon Sep 17 00:00:00 2001 From: MerlinSmiles Date: Thu, 16 Mar 2017 17:07:56 +0100 Subject: [PATCH] fix: Keithley mode and output parser (#531) --- .../instrument_drivers/tektronix/Keithley_2600.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qcodes/instrument_drivers/tektronix/Keithley_2600.py b/qcodes/instrument_drivers/tektronix/Keithley_2600.py index ce05422e25e..7b9128a5b10 100644 --- a/qcodes/instrument_drivers/tektronix/Keithley_2600.py +++ b/qcodes/instrument_drivers/tektronix/Keithley_2600.py @@ -19,20 +19,26 @@ def __init__(self, name, address, channel, **kwargs): super().__init__(name, address, terminator='\n', **kwargs) self._channel = channel - self.add_parameter('volt', get_cmd='measure.v()', - get_parser=float, set_cmd='source.levelv={:.12f}', + self.add_parameter('volt', + get_cmd='measure.v()', + get_parser=float, + set_cmd='source.levelv={:.12f}', label='Voltage', unit='V') - self.add_parameter('curr', get_cmd='measure.i()', - get_parser=float, set_cmd='source.leveli={:.12f}', + self.add_parameter('curr', + get_cmd='measure.i()', + get_parser=float, + set_cmd='source.leveli={:.12f}', label='Current', unit='A') self.add_parameter('mode', get_cmd='source.func', + get_parser=float, set_cmd='source.func={:d}', val_mapping={'current': 0, 'voltage': 1}) self.add_parameter('output', get_cmd='source.output', + get_parser=float, set_cmd='source.output={:d}', val_mapping={'on': 1, 'off': 0}) # Source range