Skip to content
This repository was archived by the owner on Feb 2, 2026. It is now read-only.

Pull request to fix #10 #11

Merged
alexforencich merged 1 commit into from
Jun 25, 2014
Merged

Pull request to fix #10 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ivi/agilent/agilent2000A.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def __init__(self, *args, **kwargs):

# wavegen option
self._output_count = 1
self._output_standard_waveforms_available = StandardWaveformMapping

self._identity_description = "Agilent InfiniiVision 2000A X-series IVI oscilloscope driver"
self._identity_supported_instrument_models = ['DSOX2002A','DSOX2004A','DSOX2012A',
Expand Down Expand Up @@ -259,17 +260,17 @@ def _get_output_standard_waveform_waveform(self, index):
if not self._driver_operation_simulate and not self._get_cache_valid(index=index):
resp = self._ask(":%s:function?" % self._output_name[index])
value = resp.lower()
value = [k for k,v in StandardWaveformMapping.items() if v==value][0]
value = [k for k,v in self._output_standard_waveforms_available.items() if v==value][0]
self._output_standard_waveform_waveform[index] = value
self._set_cache_valid(index=index)
return self._output_standard_waveform_waveform[index]

def _set_output_standard_waveform_waveform(self, index, value):
index = ivi.get_index(self._output_name, index)
if value not in StandardWaveformMapping:
if value not in self._output_standard_waveforms_available:
raise ivi.ValueNotSupportedException()
if not self._driver_operation_simulate:
self._write(":%s:function %s" % (self._output_name[index], StandardWaveformMapping[value]))
self._write(":%s:function %s" % (self._output_name[index], self._output_standard_waveforms_available[value]))
self._output_standard_waveform_waveform[index] = value
self._set_cache_valid(index=index)

Expand Down
1 change: 1 addition & 0 deletions ivi/agilent/agilent3000A.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def __init__(self, *args, **kwargs):

# wavegen option
self._output_count = 1
self._output_standard_waveforms_available = StandardWaveformMapping

self._identity_description = "Agilent InfiniiVision 3000A X-series IVI oscilloscope driver"
self._identity_supported_instrument_models = ['DSOX3012A','DSOX3014A','DSOX3024A',
Expand Down