diff --git a/_modules/qcodes/instrument_drivers/tektronix/Keithley_2000.html b/_modules/qcodes/instrument_drivers/tektronix/Keithley_2000.html index 126edeccc97..bac3239ff31 100644 --- a/_modules/qcodes/instrument_drivers/tektronix/Keithley_2000.html +++ b/_modules/qcodes/instrument_drivers/tektronix/Keithley_2000.html @@ -325,6 +325,10 @@

Source code for qcodes.instrument_drivers.tektronix.Keithley_2000

if reset: self.reset() + # Set the data format to have only ascii data without units and channels + self.write('FORM:DATA ASCII') + self.write('FORM:ELEM READ') + self.connect_message()
[docs] def trigger(self): diff --git a/api/generated/qcodes.instrument_drivers.QDev.html b/api/generated/qcodes.instrument_drivers.QDev.html index 73ebff164ac..a8405b5e69e 100644 --- a/api/generated/qcodes.instrument_drivers.QDev.html +++ b/api/generated/qcodes.instrument_drivers.QDev.html @@ -268,7 +268,7 @@

Submodules
-voltage_range_status = {'X 1': 10, 'X 0.1': 1}
+voltage_range_status = {'X 0.1': 1, 'X 1': 10}
diff --git a/api/generated/qcodes.instrument_drivers.signal_hound.html b/api/generated/qcodes.instrument_drivers.signal_hound.html index 33050faa510..0c3a3706dfb 100644 --- a/api/generated/qcodes.instrument_drivers.signal_hound.html +++ b/api/generated/qcodes.instrument_drivers.signal_hound.html @@ -313,12 +313,12 @@

Submodules
-saStatus = {'saTrackingGeneratorNotFound': -10, 'saExternalReferenceNotFound': -89, 'saInvalidParameterErr': -4, 'saNullPtrErr': -1, 'saBandwidthClamped': 4, 'saInvalidScaleErr': -94, 'saNoError': 0, 'saUSBCommErr': -11, 'saInvalidDetectorErr': -95, 'saOvenColdErr': -20, 'saFrequencyRangeErr': -99, 'saInvalidDeviceErr': -2, 'saNoCorrections': 1, 'saDeviceNotOpenErr': -3, 'saTooManyDevicesErr': -5, 'saUnknownErr': -666, 'saNotConfiguredErr': -6, 'saBandwidthErr': -91, 'saDeviceNotConfiguredErr': -6, 'saInternetErr': -12, 'saParameterClamped': 3, 'saDeviceNotIdleErr': -9, 'saInvalidModeErr': -7, 'saDeviceNotFoundErr': -8, 'saCompressionWarning': 2}
+saStatus = {'saCompressionWarning': 2, 'saNotConfiguredErr': -6, 'saBandwidthClamped': 4, 'saTrackingGeneratorNotFound': -10, 'saDeviceNotOpenErr': -3, 'saInvalidModeErr': -7, 'saInvalidParameterErr': -4, 'saInternetErr': -12, 'saExternalReferenceNotFound': -89, 'saNoCorrections': 1, 'saInvalidDetectorErr': -95, 'saUnknownErr': -666, 'saOvenColdErr': -20, 'saInvalidDeviceErr': -2, 'saFrequencyRangeErr': -99, 'saDeviceNotIdleErr': -9, 'saBandwidthErr': -91, 'saParameterClamped': 3, 'saNoError': 0, 'saDeviceNotConfiguredErr': -6, 'saUSBCommErr': -11, 'saNullPtrErr': -1, 'saTooManyDevicesErr': -5, 'saInvalidScaleErr': -94, 'saDeviceNotFoundErr': -8}

-saStatus_inverted = {0: 'saNoError', 1: 'saNoCorrections', 2: 'saCompressionWarning', 3: 'saParameterClamped', 4: 'saBandwidthClamped', -1: 'saNullPtrErr', -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: 'saDeviceNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -2: 'saInvalidDeviceErr'}
+saStatus_inverted = {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: 'saDeviceNotConfiguredErr', -5: 'saTooManyDevicesErr', -4: 'saInvalidParameterErr', -3: 'saDeviceNotOpenErr', -1: 'saNullPtrErr'}
diff --git a/api/generated/qcodes.instrument_drivers.tektronix.html b/api/generated/qcodes.instrument_drivers.tektronix.html index 39d9ce1b480..1dbb9f9cabb 100644 --- a/api/generated/qcodes.instrument_drivers.tektronix.html +++ b/api/generated/qcodes.instrument_drivers.tektronix.html @@ -260,12 +260,12 @@

Submodules
-AWG_FILE_FORMAT_CHANNEL = {'ANALOG_OFFSET_N': 'd', 'DIGITAL_OFFSET_N': 'd', 'MARKER1_OFFSET_N': 'd', 'MARKER2_AMPLITUDE_N': 'd', 'CHANNEL_STATE_N': 'h', 'DC_OUTPUT_LEVEL_N': 'd', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'ANALOG_AMPLITUDE_N': 'd', 'ANALOG_FILTER_N': 'h', 'DIGITAL_LOW_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'MARKER2_METHOD_N': 'h', 'MARKER2_HIGH_N': 'd', 'EXTERNAL_ADD_N': 'h', 'DELAY_IN_POINTS_N': 'd', 'DELAY_IN_TIME_N': 'd', 'MARKER1_HIGH_N': 'd', 'CHANNEL_SKEW_N': 'd', 'MARKER2_LOW_N': 'd', 'PHASE_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'MARKER1_SKEW_N': 'd', 'ANALOG_LOW_N': 'd', 'ANALOG_METHOD_N': 'h', 'MARKER1_METHOD_N': 'h', 'MARKER2_SKEW_N': 'd', 'DIGITAL_METHOD_N': 'h', 'DIGITAL_HIGH_N': 'd', 'MARKER2_OFFSET_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_HIGH_N': 'd'}
+AWG_FILE_FORMAT_CHANNEL = {'MARKER1_SKEW_N': 'd', 'DIGITAL_AMPLITUDE_N': 'd', 'MARKER2_SKEW_N': 'd', 'ANALOG_OFFSET_N': 'd', 'DC_OUTPUT_LEVEL_N': 'd', 'PHASE_DELAY_INPUT_METHOD_N': 'h', 'EXTERNAL_ADD_N': 'h', 'ANALOG_DIRECT_OUTPUT_N': 'h', 'MARKER2_AMPLITUDE_N': 'd', 'MARKER1_HIGH_N': 'd', 'MARKER1_OFFSET_N': 'd', 'DIGITAL_HIGH_N': 'd', 'OUTPUT_WAVEFORM_NAME_N': 's', 'ANALOG_FILTER_N': 'h', 'ANALOG_AMPLITUDE_N': 'd', 'MARKER1_LOW_N': 'd', 'ANALOG_HIGH_N': 'd', 'DIGITAL_METHOD_N': 'h', 'CHANNEL_SKEW_N': 'd', 'ANALOG_METHOD_N': 'h', 'DELAY_IN_POINTS_N': 'd', 'MARKER1_AMPLITUDE_N': 'd', 'CHANNEL_STATE_N': 'h', 'DIGITAL_LOW_N': 'd', 'DELAY_IN_TIME_N': 'd', 'MARKER2_LOW_N': 'd', 'MARKER2_METHOD_N': 'h', 'MARKER1_METHOD_N': 'h', 'DIGITAL_OFFSET_N': 'd', 'ANALOG_LOW_N': 'd', 'MARKER2_OFFSET_N': 'd', 'PHASE_N': 'd', 'MARKER2_HIGH_N': 'd'}

-AWG_FILE_FORMAT_HEAD = {'EVENT_INPUT_POLARITY': 'h', 'REFERENCE_MULTIPLIER_RATE': 'h', 'CLOCK_SOURCE': 'h', 'COUPLING': 'h', 'DIVIDER_RATE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'HOLD_REPETITION_RATE': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'ZEROING': 'h', 'EVENT_INPUT_THRESHOLD': 'd', 'REPETITION_RATE': 'd', 'TRIGGER_SOURCE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'JUMP_TIMING': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'REFERENCE_SOURCE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'INTERLEAVE': 'h', 'WAIT_VALUE': 'h', 'RUN_STATE': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'SAMPLING_RATE': 'd', 'TRIGGER_INPUT_POLARITY': 'h', 'TRIGGER_INPUT_THRESHOLD': 'd', 'RUN_MODE': 'h'}
+AWG_FILE_FORMAT_HEAD = {'REFERENCE_CLOCK_FREQUENCY_SELECTION': 'h', 'CLOCK_SOURCE': 'h', 'EVENT_INPUT_IMPEDANCE': 'h', 'TRIGGER_INPUT_POLARITY': 'h', 'INTERLEAVE_ADJ_AMPLITUDE': 'd', 'TRIGGER_INPUT_THRESHOLD': 'd', 'SAMPLING_RATE': 'd', 'EVENT_INPUT_THRESHOLD': 'd', 'COUPLING': 'h', 'TRIGGER_INPUT_IMPEDANCE': 'h', 'ZEROING': 'h', 'INTERNAL_TRIGGER_RATE': 'd', 'TRIGGER_SOURCE': 'h', 'JUMP_TIMING': 'h', 'RUN_STATE': 'h', 'HOLD_REPETITION_RATE': 'h', 'REPETITION_RATE': 'd', 'RUN_MODE': 'h', 'EVENT_INPUT_POLARITY': 'h', 'REFERENCE_SOURCE': 'h', 'DIVIDER_RATE': 'h', 'INTERLEAVE': 'h', 'WAIT_VALUE': 'h', 'TRIGGER_INPUT_SLOPE': 'h', 'EXTERNAL_REFERENCE_TYPE': 'h', 'INTERLEAVE_ADJ_PHASE': 'd', 'REFERENCE_MULTIPLIER_RATE': 'h'}