Skip to content

Commit

Permalink
fix: Keithley mode and output parser (#531)
Browse files Browse the repository at this point in the history
  • Loading branch information
MerlinSmiles authored and giulioungaretti committed Mar 16, 2017
1 parent 177f820 commit ac89a71
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions qcodes/instrument_drivers/tektronix/Keithley_2600.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac89a71

Please sign in to comment.