Skip to content

Commit ec88e59

Browse files
authored
Keithley 2280S (alexforencich#2)
* Driver for Keithley 2280S power supply * Added more instrument functionality * Add ADC auto-zero functionality for faster sampling rates. * Add more measurement functionality. Make all functions support multichannel instruments. * Add more measurement functionality * Add more trigger functionality * Change _output_fetch_measurement() so that all data is fetched in a single instrument call
1 parent f86ef55 commit ec88e59

6 files changed

Lines changed: 744 additions & 0 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Instrument standard from the [IVI foundation](http://www.ivifoundation.org/).
4343
* Chroma 62000P series
4444
* Rigol DP800 series
4545
* Rigol DP1000 series
46+
* Keithley (Tektronix) 2280S series
4647
* Tektronix PS2520G/PS2521G
4748
* RF Power Meters (pwrmeter):
4849
* Agilent 436A

ivi/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
"colby",
5151
"ics",
5252
"jdsu",
53+
"keithley",
5354
"lecroy",
5455
"rigol",
5556
"rohdeschwarz",

ivi/interface/pyvisa.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
# New style PyVISA
3535
visa_rm = visa.ResourceManager()
3636
visa_instrument_opener = visa_rm.open_resource
37+
except OSError:
38+
visa_rm = visa.ResourceManager('@py')
39+
visa_instrument_opener = visa_rm.open_resource
3740
except AttributeError:
3841
# Old style PyVISA
3942
visa_instrument_opener = visa.instrument

ivi/keithley/__init__.py

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"""
2+
3+
Python Interchangeable Virtual Instrument Library
4+
5+
Copyright (c) 2017 Jonas Långbacka, Acconeer Ab
6+
7+
Permission is hereby granted, free of charge, to any person obtaining a copy
8+
of this software and associated documentation files (the "Software"), to deal
9+
in the Software without restriction, including without limitation the rights
10+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11+
copies of the Software, and to permit persons to whom the Software is
12+
furnished to do so, subject to the following conditions:
13+
14+
The above copyright notice and this permission notice shall be included in
15+
all copies or substantial portions of the Software.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
19+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
THE SOFTWARE.
24+
25+
"""
26+
27+
# DC Power Supplies
28+
from .keithley2280S import keithley2280S
29+
#from .keithley2280S import keithley2280S_60_3

0 commit comments

Comments
 (0)