Generated gh-pages for commit d5f413f

Merge: b44ceae 2c9e197 Author: William H.P. Nielsen <[email protected]> Merge pull request #550 from jenshnielsen/zi_fixes
microsoft · Mar 30, 2017 · d5a8605 · d5a8605
1 parent 96e4afe
commit d5a8605
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/api/generated/qcodes.instrument_drivers.QDev.html b/api/generated/qcodes.instrument_drivers.QDev.html
@@ -274,7 +274,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.QDev.QDac.QDac.voltage_range_status">
-<code class="descname">voltage_range_status</code><em class="property"> = {'X 1': 10, 'X 0.1': 1}</em><a class="headerlink" href="#qcodes.instrument_drivers.QDev.QDac.QDac.voltage_range_status" title="Permalink to this definition">¶</a></dt>
+<code class="descname">voltage_range_status</code><em class="property"> = {'X 0.1': 1, 'X 1': 10}</em><a class="headerlink" href="#qcodes.instrument_drivers.QDev.QDac.QDac.voltage_range_status" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">

diff --git a/api/generated/qcodes.instrument_drivers.signal_hound.html b/api/generated/qcodes.instrument_drivers.signal_hound.html
@@ -313,7 +313,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus">
-<code class="descname">saStatus</code><em class="property"> = {'saNoCorrections': 1, 'saNoError': 0, 'saUSBCommErr': -11, 'saNullPtrErr': -1, 'saOvenColdErr': -20, 'saDeviceNotIdleErr': -9, 'saCompressionWarning': 2, 'saNotConfiguredErr': -6, 'saDeviceNotFoundErr': -8, 'saParameterClamped': 3, 'saTooManyDevicesErr': -5, 'saInvalidModeErr': -7, 'saInvalidScaleErr': -94, 'saFrequencyRangeErr': -99, 'saInvalidDeviceErr': -2, 'saBandwidthClamped': 4, 'saUnknownErr': -666, 'saBandwidthErr': -91, 'saDeviceNotConfiguredErr': -6, 'saInternetErr': -12, 'saDeviceNotOpenErr': -3, 'saExternalReferenceNotFound': -89, 'saTrackingGeneratorNotFound': -10, 'saInvalidDetectorErr': -95, 'saInvalidParameterErr': -4}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus" title="Permalink to this definition">¶</a></dt>
+<code class="descname">saStatus</code><em class="property"> = {'saInvalidParameterErr': -4, 'saInvalidDetectorErr': -95, 'saBandwidthErr': -91, 'saNoError': 0, 'saFrequencyRangeErr': -99, 'saInvalidScaleErr': -94, 'saDeviceNotFoundErr': -8, 'saDeviceNotOpenErr': -3, 'saNotConfiguredErr': -6, 'saUnknownErr': -666, 'saOvenColdErr': -20, 'saNoCorrections': 1, 'saDeviceNotIdleErr': -9, 'saTrackingGeneratorNotFound': -10, 'saTooManyDevicesErr': -5, 'saBandwidthClamped': 4, 'saExternalReferenceNotFound': -89, 'saInvalidModeErr': -7, 'saUSBCommErr': -11, 'saInvalidDeviceErr': -2, 'saCompressionWarning': 2, 'saInternetErr': -12, 'saParameterClamped': 3, 'saNullPtrErr': -1, 'saDeviceNotConfiguredErr': -6}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="attribute">

diff --git a/api/generated/qcodes.instrument_drivers.tektronix.html b/api/generated/qcodes.instrument_drivers.tektronix.html
@@ -260,12 +260,12 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 </table>
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL">
-<code class="descname">AWG_FILE_FORMAT_CHANNEL</code><em class="property"> = {'DELAY_IN_POINTS_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'CHANNEL_STATE_N': 'h', 'MARKER2_OFFSET_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'PHASE_N': 'd', 'DIGITAL_LOW_N': 'd', 'CHANNEL_SKEW_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'ANALOG_OFFSET_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'MARKER1_SKEW_N': 'd', 'MARKER2_SKEW_N': 'd', 'MARKER2_METHOD_N': 'h', 'DIGITAL_HIGH_N': 'd', 'MARKER1_OFFSET_N': 'd', 'MARKER1_HIGH_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'MARKER2_HIGH_N': 'd', 'ANALOG_FILTER_N': 'h', 'DELAY_IN_TIME_N': 'd', 'ANALOG_HIGH_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER2_LOW_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'ANALOG_METHOD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER1_METHOD_N': 'h', 'ANALOG_LOW_N': 'd', 'EXTERNAL_ADD_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'MARKER1_LOW_N': 'd', 'DIGITAL_METHOD_N': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL" title="Permalink to this definition">¶</a></dt>
+<code class="descname">AWG_FILE_FORMAT_CHANNEL</code><em class="property"> = {'MARKER2_SKEW_N': 'd', 'EXTERNAL_ADD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_METHOD_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'ANALOG_METHOD_N': 'h', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER1_AMPLITUDE_N': 'd', 'DIGITAL_METHOD_N': 'h', 'MARKER1_METHOD_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'MARKER2_HIGH_N': 'd', 'DIGITAL_HIGH_N': 'd', 'CHANNEL_SKEW_N': 'd', 'MARKER1_SKEW_N': 'd', 'PHASE_N': 'd', 'MARKER1_OFFSET_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'DELAY_IN_TIME_N': 'd', 'ANALOG_HIGH_N': 'd', 'MARKER2_LOW_N': 'd', 'MARKER1_HIGH_N': 'd', 'ANALOG_FILTER_N': 'h', 'MARKER2_OFFSET_N': 'd', 'DIGITAL_LOW_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_OFFSET_N': 'd', 'ANALOG_LOW_N': 'd', 'CHANNEL_STATE_N': 'h', 'DELAY_IN_POINTS_N': 'd'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_CHANNEL" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="attribute">
 <dt id="qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD">
-<code class="descname">AWG_FILE_FORMAT_HEAD</code><em class="property"> = {'INTERLEAVE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'RUN_MODE': 'h', 'DIVIDER_RATE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'INTERLEAVE_ADJ_PHASE': 'd', 'RUN_STATE': 'h', 'ZEROING': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'COUPLING': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'SAMPLING_RATE': 'd', 'CLOCK_SOURCE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'JUMP_TIMING': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'REPETITION_RATE': 'd', 'EXTERNAL_REFERENCE_TYPE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'WAIT_VALUE': 'h', 'TRIGGER_SOURCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'EVENT_INPUT_POLARITY': 'h', 'REFERENCE_SOURCE': 'h', 'HOLD_REPETITION_RATE': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD" title="Permalink to this definition">¶</a></dt>
+<code class="descname">AWG_FILE_FORMAT_HEAD</code><em class="property"> = {'RUN_STATE': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'HOLD_REPETITION_RATE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'SAMPLING_RATE': 'd', 'WAIT_VALUE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'ZEROING': 'h', 'REPETITION_RATE': 'd', 'RUN_MODE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'COUPLING': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'EVENT_INPUT_POLARITY': 'h', 'JUMP_TIMING': 'h', 'INTERLEAVE': 'h', 'CLOCK_SOURCE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'EVENT_INPUT_THRESHOLD': 'd', 'TRIGGER_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'TRIGGER_SOURCE': 'h', 'DIVIDER_RATE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'REFERENCE_SOURCE': 'h'}</em><a class="headerlink" href="#qcodes.instrument_drivers.tektronix.AWG5014.Tektronix_AWG5014.AWG_FILE_FORMAT_HEAD" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">