Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RS SGS100A driver #817

Merged
merged 6 commits into from Oct 26, 2017
Merged

RS SGS100A driver #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dbd0b3
SGS100A Driver
ThorvaldLarsen Oct 24, 2017
36df425
Change parameter name
ThorvaldLarsen Oct 24, 2017
52b6ffc
Merge branch 'master' into RS_SGS100A
jenshnielsen Oct 26, 2017
68d5812
Strip trailing whitespace
jenshnielsen Oct 26, 2017
f8ce2c2
remove .DS_Store files
jenshnielsen Oct 26, 2017
62a5012
Ignore DS_Store
jenshnielsen Oct 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Expand Up @@ -79,4 +79,7 @@ tmp/

docs/examples/data/*

.idea/
.idea/

# Mac files
.DS_Store
12 changes: 12 additions & 0 deletions qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
View file
Open in desktop
Expand Up @@ -56,6 +56,11 @@ def __init__(self, name, address, **kwargs):
set_cmd=self.set_status,
get_parser=self.parse_on_off,
vals=vals.Strings())
self.add_parameter('IQ_state',
get_cmd=':IQ:STAT?',
set_cmd=self.set_IQ_state,
get_parser=self.parse_on_off,
vals=vals.Strings())
self.add_parameter('pulsemod_state',
get_cmd=':SOUR:PULM:STAT?',
set_cmd=self.set_pulsemod_state,
Expand Down Expand Up @@ -102,6 +107,13 @@ def set_status(self, stat):
raise ValueError('Unable to set status to %s, ' % stat +
'expected "ON" or "OFF"')

def set_IQ_state(self, stat):
if stat.upper() in ('ON', 'OFF'):
self.write(':IQ:STAT %s' % stat)
else:
raise ValueError('Unable to set status to %s, ' % stat +
'expected "ON" or "OFF"')

def set_pulsemod_state(self, stat):
if stat.upper() in ('ON', 'OFF'):
self.write(':PULM:SOUR EXT')
Expand Down