From 9f7989b41061a0f63140b70f550c6ecdc6443411 Mon Sep 17 00:00:00 2001 From: Natalie Pearson Date: Tue, 1 Nov 2016 13:37:31 +0100 Subject: [PATCH 1/4] basic Keithley 2400 driver added --- .../tektronix/Keithley_2400.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 qcodes/instrument_drivers/tektronix/Keithley_2400.py diff --git a/qcodes/instrument_drivers/tektronix/Keithley_2400.py b/qcodes/instrument_drivers/tektronix/Keithley_2400.py new file mode 100644 index 000000000000..ab4ab117c6f8 --- /dev/null +++ b/qcodes/instrument_drivers/tektronix/Keithley_2400.py @@ -0,0 +1,24 @@ +from qcodes import VisaInstrument +from qcodes.utils.validators import Numbers, Ints, Enum, MultiType, Bool + + +class Keithley_2400(VisaInstrument): + """ + Driver for the Keithley 2400 multimeter. + """ + def __init__(self, name, address, reset=False, **kwargs): + super().__init__(name, address, terminator='\n', **kwargs) + + self.add_parameter(name = 'voltage', + set_cmd='SOURCE:VOLTAGE:LEVEL {:.4f}', + get_cmd='SOURCE:VOLTAGE:LEVEL?', + get_parser=float, + vals=Numbers(-10, 10) + ) + + self.initialise() + self.connect_message() + + def initialise(self): + self.write('SOURCE:FUNCTION:MODE VOLTAGE') + self.write('INIT') From 91bb731f0d92ad6a3338c41882b8fcb9d08e517f Mon Sep 17 00:00:00 2001 From: Natalie Pearson Date: Thu, 9 Mar 2017 12:06:36 +0100 Subject: [PATCH 2/4] merge with master and update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 840a47c00374..8601508af456 100644 --- a/.gitignore +++ b/.gitignore @@ -76,4 +76,5 @@ target/ *.py~ tmp/ -docs/examples/data/* +# Other +.DS_Store From c1a58def29412534a4bdd526c1cce69c39aa98b1 Mon Sep 17 00:00:00 2001 From: Natalie Pearson Date: Thu, 9 Mar 2017 12:11:33 +0100 Subject: [PATCH 3/4] pep8 and making reset optional) --- .../instrument_drivers/tektronix/Keithley_2400.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/qcodes/instrument_drivers/tektronix/Keithley_2400.py b/qcodes/instrument_drivers/tektronix/Keithley_2400.py index ab4ab117c6f8..92f69dbdebd5 100644 --- a/qcodes/instrument_drivers/tektronix/Keithley_2400.py +++ b/qcodes/instrument_drivers/tektronix/Keithley_2400.py @@ -1,22 +1,29 @@ from qcodes import VisaInstrument -from qcodes.utils.validators import Numbers, Ints, Enum, MultiType, Bool +from qcodes.utils.validators import Numbers class Keithley_2400(VisaInstrument): """ Driver for the Keithley 2400 multimeter. + + Args: + name + address + reset (bool): optional """ + def __init__(self, name, address, reset=False, **kwargs): super().__init__(name, address, terminator='\n', **kwargs) - self.add_parameter(name = 'voltage', + self.add_parameter(name='voltage', set_cmd='SOURCE:VOLTAGE:LEVEL {:.4f}', get_cmd='SOURCE:VOLTAGE:LEVEL?', get_parser=float, vals=Numbers(-10, 10) ) - self.initialise() + if reset: + self.initialise() self.connect_message() def initialise(self): From ccf6388dd31e6c3d45d739c9a527469f4f2a4d83 Mon Sep 17 00:00:00 2001 From: Natalie Pearson Date: Thu, 9 Mar 2017 12:12:50 +0100 Subject: [PATCH 4/4] put examples/data bacn into gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8601508af456..e2507519f676 100644 --- a/.gitignore +++ b/.gitignore @@ -77,4 +77,5 @@ target/ tmp/ # Other +docs/examples/data/* .DS_Store