diff --git a/labscript_devices/NI_DAQmx/models/NI_PCIe_6343.py b/labscript_devices/NI_DAQmx/models/NI_PCIe_6343.py new file mode 100644 index 00000000..f07155a3 --- /dev/null +++ b/labscript_devices/NI_DAQmx/models/NI_PCIe_6343.py @@ -0,0 +1,55 @@ +##################################################################### +# # +# /NI_DAQmx/models/_subclass_template.py # +# # +# Copyright 2018, Christopher Billington # +# # +# This file is part of the module labscript_devices, in the # +# labscript suite (see http://labscriptsuite.org), and is # +# licensed under the Simplified BSD License. See the license.txt # +# file in the root of the project for the full license. # +# # +##################################################################### + +##################################################################### +# WARNING # +# # +# This file is auto-generated, any modifications may be # +# overwritten. See README.txt in this folder for details # +# # +##################################################################### + + +from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx + +CAPABILITIES = { + 'AI_range': [-10.0, 10.0], + 'AI_start_delay': 7e-08, + 'AO_range': [-10.0, 10.0], + 'max_AI_multi_chan_rate': 500000.0, + 'max_AI_single_chan_rate': 500000.0, + 'max_AO_sample_rate': 917431.1926605505, + 'max_DO_sample_rate': 1000000.0, + 'min_semiperiod_measurement': 1e-07, + 'num_AI': 32, + 'num_AO': 4, + 'num_CI': 4, + 'ports': { + 'port0': {'num_lines': 32, 'supports_buffered': True}, + 'port1': {'num_lines': 8, 'supports_buffered': False}, + 'port2': {'num_lines': 8, 'supports_buffered': False}, + }, + 'supports_buffered_AO': True, + 'supports_buffered_DO': True, + 'supports_semiperiod_measurement': True, +} + + +class NI_PCIe_6343(NI_DAQmx): + description = 'NI-PCIe-6343' + + def __init__(self, *args, **kwargs): + # Any provided kwargs take precedent over capabilities + combined_kwargs = CAPABILITIES.copy() + combined_kwargs.update(kwargs) + NI_DAQmx.__init__(self, *args, **combined_kwargs) diff --git a/labscript_devices/NI_DAQmx/models/NI_PXIe_6363.py b/labscript_devices/NI_DAQmx/models/NI_PXIe_6363.py new file mode 100644 index 00000000..309d5d7f --- /dev/null +++ b/labscript_devices/NI_DAQmx/models/NI_PXIe_6363.py @@ -0,0 +1,55 @@ +##################################################################### +# # +# /NI_DAQmx/models/_subclass_template.py # +# # +# Copyright 2018, Christopher Billington # +# # +# This file is part of the module labscript_devices, in the # +# labscript suite (see http://labscriptsuite.org), and is # +# licensed under the Simplified BSD License. See the license.txt # +# file in the root of the project for the full license. # +# # +##################################################################### + +##################################################################### +# WARNING # +# # +# This file is auto-generated, any modifications may be # +# overwritten. See README.txt in this folder for details # +# # +##################################################################### + + +from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx + +CAPABILITIES = { + 'AI_range': [-10.0, 10.0], + 'AI_start_delay': 7e-08, + 'AO_range': [-10.0, 10.0], + 'max_AI_multi_chan_rate': 1000000.0, + 'max_AI_single_chan_rate': 2000000.0, + 'max_AO_sample_rate': 2857142.8571428573, + 'max_DO_sample_rate': 10000000.0, + 'min_semiperiod_measurement': 1e-07, + 'num_AI': 32, + 'num_AO': 4, + 'num_CI': 4, + 'ports': { + 'port0': {'num_lines': 32, 'supports_buffered': True}, + 'port1': {'num_lines': 8, 'supports_buffered': False}, + 'port2': {'num_lines': 8, 'supports_buffered': False}, + }, + 'supports_buffered_AO': True, + 'supports_buffered_DO': True, + 'supports_semiperiod_measurement': True, +} + + +class NI_PXIe_6363(NI_DAQmx): + description = 'NI-PXIe-6363' + + def __init__(self, *args, **kwargs): + # Any provided kwargs take precedent over capabilities + combined_kwargs = CAPABILITIES.copy() + combined_kwargs.update(kwargs) + NI_DAQmx.__init__(self, *args, **combined_kwargs) diff --git a/labscript_devices/NI_DAQmx/models/capabilities.json b/labscript_devices/NI_DAQmx/models/capabilities.json index 2f34c1ea..c5c6cb10 100644 --- a/labscript_devices/NI_DAQmx/models/capabilities.json +++ b/labscript_devices/NI_DAQmx/models/capabilities.json @@ -169,6 +169,42 @@ "supports_buffered_DO": true, "supports_semiperiod_measurement": false }, + "PCIe-6343": { + "AI_range": [ + -10.0, + 10.0 + ], + "AI_start_delay": 7e-08, + "AO_range": [ + -10.0, + 10.0 + ], + "max_AI_multi_chan_rate": 500000.0, + "max_AI_single_chan_rate": 500000.0, + "max_AO_sample_rate": 917431.1926605505, + "max_DO_sample_rate": 1000000.0, + "min_semiperiod_measurement": 1e-07, + "num_AI": 32, + "num_AO": 4, + "num_CI": 4, + "ports": { + "port0": { + "num_lines": 32, + "supports_buffered": true + }, + "port1": { + "num_lines": 8, + "supports_buffered": false + }, + "port2": { + "num_lines": 8, + "supports_buffered": false + } + }, + "supports_buffered_AO": true, + "supports_buffered_DO": true, + "supports_semiperiod_measurement": true + }, "PCIe-6363": { "AI_range": [ -10.0, @@ -295,6 +331,42 @@ "supports_buffered_DO": true, "supports_semiperiod_measurement": true }, + "PXIe-6363": { + "AI_range": [ + -10.0, + 10.0 + ], + "AI_start_delay": 7e-08, + "AO_range": [ + -10.0, + 10.0 + ], + "max_AI_multi_chan_rate": 1000000.0, + "max_AI_single_chan_rate": 2000000.0, + "max_AO_sample_rate": 2857142.8571428573, + "max_DO_sample_rate": 10000000.0, + "min_semiperiod_measurement": 1e-07, + "num_AI": 32, + "num_AO": 4, + "num_CI": 4, + "ports": { + "port0": { + "num_lines": 32, + "supports_buffered": true + }, + "port1": { + "num_lines": 8, + "supports_buffered": false + }, + "port2": { + "num_lines": 8, + "supports_buffered": false + } + }, + "supports_buffered_AO": true, + "supports_buffered_DO": true, + "supports_semiperiod_measurement": true + }, "PXIe-6535": { "AI_range": null, "AI_start_delay": null,