From 653131ab69ce063652b6fd75e7717e4d437da51d Mon Sep 17 00:00:00 2001
From: Documentation Bot <bot@travics.com>
Date: Fri, 27 Jan 2017 17:54:06 +0000
Subject: [PATCH] Generated gh-pages for commit f1e98e9 Merge: 72185ea de6236b
 Author: Jens Hedegaard Nielsen <jenshnielsen@gmail.com>

    Merge pull request #459 from jenshnielsen/fix/CurrentVoltageParameter
---
 api/generated/qcodes.instrument_drivers.ithaco.html       | 2 +-
 api/generated/qcodes.instrument_drivers.signal_hound.html | 4 ++--
 api/generated/qcodes.instrument_drivers.tektronix.html    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/generated/qcodes.instrument_drivers.ithaco.html b/api/generated/qcodes.instrument_drivers.ithaco.html
index 69d6569c90b..f0c0f92fcd4 100644
--- a/api/generated/qcodes.instrument_drivers.ithaco.html
+++ b/api/generated/qcodes.instrument_drivers.ithaco.html
@@ -188,7 +188,7 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <tr class="field-odd field"><th class="field-name">Parameters:</th><td class="field-body"><ul class="first last simple">
 <li><strong>measured_param</strong> (<a class="reference internal" href="qcodes.Parameter.html#qcodes.Parameter" title="qcodes.Parameter"><em>Parameter</em></a>) &#8211; a gettable parameter returning the
 voltage read from the Ithaco output.</li>
-<li><strong>c_amp_ins</strong> (<a class="reference internal" href="#module-qcodes.instrument_drivers.ithaco.Ithaco_1211" title="qcodes.instrument_drivers.ithaco.Ithaco_1211"><em>Ithaco_1211</em></a>) &#8211; <p>an Ithaco instance where you manually
+<li><strong>c_amp_ins</strong> (<a class="reference internal" href="#qcodes.instrument_drivers.ithaco.Ithaco_1211.Ithaco_1211" title="qcodes.instrument_drivers.ithaco.Ithaco_1211.Ithaco_1211"><em>Ithaco_1211</em></a>) &#8211; <p>an Ithaco instance where you manually
 maintain the present settings of the real Ithaco amp.</p>
 <p>Note: it should be possible to use other current preamps, if they
 define parameters <code class="docutils literal"><span class="pre">sens</span></code> (sensitivity, in A/V), <code class="docutils literal"><span class="pre">sens_factor</span></code>
diff --git a/api/generated/qcodes.instrument_drivers.signal_hound.html b/api/generated/qcodes.instrument_drivers.signal_hound.html
index 2e47d95732e..6c4860c5536 100644
--- a/api/generated/qcodes.instrument_drivers.signal_hound.html
+++ b/api/generated/qcodes.instrument_drivers.signal_hound.html
@@ -282,12 +282,12 @@ <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"> = {'saUSBCommErr': -11, 'saDeviceNotConfiguredErr': -6, 'saInvalidScaleErr': -94, 'saDeviceNotIdleErr': -9, 'saInternetErr': -12, 'saInvalidDetectorErr': -95, 'saNotConfiguredErr': -6, 'saNullPtrErr': -1, 'saOvenColdErr': -20, 'saInvalidModeErr': -7, 'saBandwidthClamped': 4, 'saDeviceNotFoundErr': -8, 'saFrequencyRangeErr': -99, 'saBandwidthErr': -91, 'saCompressionWarning': 2, 'saInvalidParameterErr': -4, 'saNoError': 0, 'saTooManyDevicesErr': -5, 'saParameterClamped': 3, 'saUnknownErr': -666, 'saDeviceNotOpenErr': -3, 'saNoCorrections': 1, 'saExternalReferenceNotFound': -89, 'saInvalidDeviceErr': -2, 'saTrackingGeneratorNotFound': -10}</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"> = {'saInvalidDeviceErr': -2, 'saNullPtrErr': -1, 'saInvalidParameterErr': -4, 'saDeviceNotFoundErr': -8, 'saInvalidModeErr': -7, 'saInvalidScaleErr': -94, 'saFrequencyRangeErr': -99, 'saBandwidthErr': -91, 'saNotConfiguredErr': -6, 'saTrackingGeneratorNotFound': -10, 'saCompressionWarning': 2, 'saOvenColdErr': -20, 'saNoError': 0, 'saParameterClamped': 3, 'saInvalidDetectorErr': -95, 'saUnknownErr': -666, 'saDeviceNotIdleErr': -9, 'saBandwidthClamped': 4, 'saDeviceNotOpenErr': -3, 'saTooManyDevicesErr': -5, 'saInternetErr': -12, 'saDeviceNotConfiguredErr': -6, 'saUSBCommErr': -11, 'saExternalReferenceNotFound': -89, 'saNoCorrections': 1}</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">
 <dt id="qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus_inverted">
-<code class="descname">saStatus_inverted</code><em class="property"> = {0: 'saNoError', 1: 'saNoCorrections', 2: 'saCompressionWarning', 3: 'saParameterClamped', 4: 'saBandwidthClamped', -2: 'saInvalidDeviceErr', -99: 'saFrequencyRangeErr', -95: 'saInvalidDetectorErr', -94: 'saInvalidScaleErr', -91: 'saBandwidthErr', -666: 'saUnknownErr', -89: 'saExternalReferenceNotFound', -20: 'saOvenColdErr', -12: 'saInternetErr', -11: 'saUSBCommErr', -10: 'saTrackingGeneratorNotFound', -9: 'saDeviceNotIdleErr', -8: 'saDeviceNotFoundErr', -7: 'saInvalidModeErr', -6: 'saNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -1: 'saNullPtrErr'}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus_inverted" title="Permalink to this definition">¶</a></dt>
+<code class="descname">saStatus_inverted</code><em class="property"> = {0: 'saNoError', 1: 'saNoCorrections', 2: 'saCompressionWarning', 3: 'saParameterClamped', 4: 'saBandwidthClamped', -99: 'saFrequencyRangeErr', -95: 'saInvalidDetectorErr', -94: 'saInvalidScaleErr', -91: 'saBandwidthErr', -666: 'saUnknownErr', -89: 'saExternalReferenceNotFound', -20: 'saOvenColdErr', -12: 'saInternetErr', -2: 'saInvalidDeviceErr', -10: 'saTrackingGeneratorNotFound', -9: 'saDeviceNotIdleErr', -8: 'saDeviceNotFoundErr', -7: 'saInvalidModeErr', -6: 'saDeviceNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -1: 'saNullPtrErr', -11: 'saUSBCommErr'}</em><a class="headerlink" href="#qcodes.instrument_drivers.signal_hound.USB_SA124B.SignalHound_USB_SA124B.saStatus_inverted" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>
 
 <dl class="method">
diff --git a/api/generated/qcodes.instrument_drivers.tektronix.html b/api/generated/qcodes.instrument_drivers.tektronix.html
index 3ab20f8903e..9e128cd9359 100644
--- a/api/generated/qcodes.instrument_drivers.tektronix.html
+++ b/api/generated/qcodes.instrument_drivers.tektronix.html
@@ -208,12 +208,12 @@ <h2>Submodules<a class="headerlink" href="#submodules" title="Permalink to this
 <p>7-1-2016 Converted to use with QCodes</p>
 <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"> = {'MARKER1_AMPLITUDE_N': 'd', 'MARKER2_SKEW_N': 'd', 'ANALOG_HIGH_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'MARKER2_METHOD_N': 'h', 'MARKER2_OFFSET_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'DIGITAL_METHOD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER1_SKEW_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'DIGITAL_AMPLITUDE_N': 'd', 'EXTERNAL_ADD_N': 'h', 'ANALOG_FILTER_N': 'h', 'DELAY_IN_TIME_N': 'd', 'PHASE_N': 'd', 'ANALOG_METHOD_N': 'h', 'ANALOG_LOW_N': 'd', 'MARKER2_LOW_N': 'd', 'ANALOG_OFFSET_N': 'd', 'MARKER1_HIGH_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER1_LOW_N': 'd', 'DIGITAL_LOW_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'MARKER1_METHOD_N': 'h', 'DIGITAL_HIGH_N': 'd', 'DELAY_IN_POINTS_N': 'd', 'MARKER2_HIGH_N': 'd', 'MARKER1_OFFSET_N': 'd', 'ANALOG_AMPLITUDE_N': 'd', 'CHANNEL_SKEW_N': 'd', 'CHANNEL_STATE_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_METHOD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'MARKER2_HIGH_N': 'd', 'ANALOG_LOW_N': 'd', 'DIGITAL_LOW_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER1_OFFSET_N': 'd', 'CHANNEL_SKEW_N': 'd', 'DIGITAL_HIGH_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'DELAY_IN_TIME_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'MARKER1_LOW_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'ANALOG_OFFSET_N': 'd', 'MARKER2_OFFSET_N': 'd', 'ANALOG_HIGH_N': 'd', 'CHANNEL_STATE_N': 'h', 'ANALOG_AMPLITUDE_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'EXTERNAL_ADD_N': 'h', 'PHASE_N': 'd', 'MARKER2_LOW_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'MARKER2_SKEW_N': 'd', 'MARKER1_HIGH_N': 'd', 'DIGITAL_METHOD_N': 'h', 'ANALOG_FILTER_N': 'h', 'MARKER1_METHOD_N': 'h', 'MARKER1_SKEW_N': 'd', '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"> = {'COUPLING': 'h', 'TRIGGER_SOURCE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'CLOCK_SOURCE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'WAIT_VALUE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'HOLD_REPETITION_RATE': 'h', 'ZEROING': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'RUN_STATE': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'REFERENCE_MULTIPLIER_RATE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'INTERLEAVE': 'h', 'DIVIDER_RATE': 'h', 'REPETITION_RATE': 'd', 'EXTERNAL_REFERENCE_TYPE': 'h', 'REFERENCE_SOURCE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'SAMPLING_RATE': 'd', 'EVENT_INPUT_IMPEDANCE': 'h', 'JUMP_TIMING': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'RUN_MODE': '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"> = {'INTERLEAVE': 'h', 'COUPLING': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'TRIGGER_SOURCE': 'h', 'RUN_STATE': 'h', 'SAMPLING_RATE': 'd', 'REFERENCE_SOURCE': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'JUMP_TIMING': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'REPETITION_RATE': 'd', 'TRIGGER_INPUT_THRESHOLD': 'd', 'CLOCK_SOURCE': 'h', 'ZEROING': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'DIVIDER_RATE': 'h', 'WAIT_VALUE': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'TRIGGER_INPUT_SLOPE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'EVENT_INPUT_IMPEDANCE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'HOLD_REPETITION_RATE': 'h', 'RUN_MODE': '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">