Skip to content

Commit 2f5393c

Browse files
dihmdihm
committed
Update existing capabilities.json and pre-generated models with new
functionality for AI termination configuration. Note, this commit also sorts out #67.
1 parent be71723 commit 2f5393c

18 files changed

+1488
-88
lines changed

‎labscript_devices/NI_DAQmx/models/NI_PCI_6251.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,27 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': [-10.0, 10.0],
28+
'AI_range_Diff': [-10.0, 10.0],
2829
'AI_start_delay': 2.5e-07,
30+
'AI_term': 'RSE',
31+
'AI_term_cfg': {
32+
'ai0': ['RSE', 'NRSE', 'Diff'],
33+
'ai1': ['RSE', 'NRSE', 'Diff'],
34+
'ai10': ['RSE', 'NRSE'],
35+
'ai11': ['RSE', 'NRSE'],
36+
'ai12': ['RSE', 'NRSE'],
37+
'ai13': ['RSE', 'NRSE'],
38+
'ai14': ['RSE', 'NRSE'],
39+
'ai15': ['RSE', 'NRSE'],
40+
'ai2': ['RSE', 'NRSE', 'Diff'],
41+
'ai3': ['RSE', 'NRSE', 'Diff'],
42+
'ai4': ['RSE', 'NRSE', 'Diff'],
43+
'ai5': ['RSE', 'NRSE', 'Diff'],
44+
'ai6': ['RSE', 'NRSE', 'Diff'],
45+
'ai7': ['RSE', 'NRSE', 'Diff'],
46+
'ai8': ['RSE', 'NRSE'],
47+
'ai9': ['RSE', 'NRSE'],
48+
},
2949
'AO_range': [-10.0, 10.0],
3050
'max_AI_multi_chan_rate': 1000000.0,
3151
'max_AI_single_chan_rate': 1250000.0,
@@ -43,6 +63,7 @@
4363
'supports_buffered_AO': True,
4464
'supports_buffered_DO': True,
4565
'supports_semiperiod_measurement': True,
66+
'supports_simultaneous_AI_sampling': False,
4667
}
4768

4869

‎labscript_devices/NI_DAQmx/models/NI_PCI_6534.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': None,
28+
'AI_range_Diff': None,
2829
'AI_start_delay': None,
2930
'AO_range': None,
3031
'max_AI_multi_chan_rate': None,

‎labscript_devices/NI_DAQmx/models/NI_PCI_6713.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': None,
28+
'AI_range_Diff': None,
2829
'AI_start_delay': None,
2930
'AO_range': [-10.0, 10.0],
3031
'max_AI_multi_chan_rate': None,

‎labscript_devices/NI_DAQmx/models/NI_PCI_6733.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': None,
28+
'AI_range_Diff': None,
2829
'AI_start_delay': None,
2930
'AO_range': [-10.0, 10.0],
3031
'max_AI_multi_chan_rate': None,

‎labscript_devices/NI_DAQmx/models/NI_PCI_DIO_32HS.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': None,
28+
'AI_range_Diff': None,
2829
'AI_start_delay': None,
2930
'AO_range': None,
3031
'max_AI_multi_chan_rate': None,

‎labscript_devices/NI_DAQmx/models/NI_PCIe_6343.py‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
#####################################################################
2+
# #
3+
# /NI_DAQmx/models/_subclass_template.py #
4+
# #
5+
# Copyright 2018, Christopher Billington #
6+
# #
7+
# This file is part of the module labscript_devices, in the #
8+
# labscript suite (see http://labscriptsuite.org), and is #
9+
# licensed under the Simplified BSD License. See the license.txt #
10+
# file in the root of the project for the full license. #
11+
# #
12+
#####################################################################
13+
14+
#####################################################################
15+
# WARNING #
16+
# #
17+
# This file is auto-generated, any modifications may be #
18+
# overwritten. See README.txt in this folder for details #
19+
# #
20+
#####################################################################
21+
22+
23+
from labscript_devices.NI_DAQmx.labscript_devices import NI_DAQmx
24+
25+
#:
26+
CAPABILITIES = {
27+
'AI_range': [-10.0, 10.0],
28+
'AI_range_Diff': [-10.0, 10.0],
29+
'AI_start_delay': 7e-08,
30+
'AI_term': 'RSE',
31+
'AI_term_cfg': {
32+
'ai0': ['RSE', 'NRSE', 'Diff'],
33+
'ai1': ['RSE', 'NRSE', 'Diff'],
34+
'ai10': ['RSE', 'NRSE'],
35+
'ai11': ['RSE', 'NRSE'],
36+
'ai12': ['RSE', 'NRSE'],
37+
'ai13': ['RSE', 'NRSE'],
38+
'ai14': ['RSE', 'NRSE'],
39+
'ai15': ['RSE', 'NRSE'],
40+
'ai16': ['RSE', 'NRSE', 'Diff'],
41+
'ai17': ['RSE', 'NRSE', 'Diff'],
42+
'ai18': ['RSE', 'NRSE', 'Diff'],
43+
'ai19': ['RSE', 'NRSE', 'Diff'],
44+
'ai2': ['RSE', 'NRSE', 'Diff'],
45+
'ai20': ['RSE', 'NRSE', 'Diff'],
46+
'ai21': ['RSE', 'NRSE', 'Diff'],
47+
'ai22': ['RSE', 'NRSE', 'Diff'],
48+
'ai23': ['RSE', 'NRSE', 'Diff'],
49+
'ai24': ['RSE', 'NRSE'],
50+
'ai25': ['RSE', 'NRSE'],
51+
'ai26': ['RSE', 'NRSE'],
52+
'ai27': ['RSE', 'NRSE'],
53+
'ai28': ['RSE', 'NRSE'],
54+
'ai29': ['RSE', 'NRSE'],
55+
'ai3': ['RSE', 'NRSE', 'Diff'],
56+
'ai30': ['RSE', 'NRSE'],
57+
'ai31': ['RSE', 'NRSE'],
58+
'ai4': ['RSE', 'NRSE', 'Diff'],
59+
'ai5': ['RSE', 'NRSE', 'Diff'],
60+
'ai6': ['RSE', 'NRSE', 'Diff'],
61+
'ai7': ['RSE', 'NRSE', 'Diff'],
62+
'ai8': ['RSE', 'NRSE'],
63+
'ai9': ['RSE', 'NRSE'],
64+
},
65+
'AO_range': [-10.0, 10.0],
66+
'max_AI_multi_chan_rate': 500000.0,
67+
'max_AI_single_chan_rate': 500000.0,
68+
'max_AO_sample_rate': 917431.1926605505,
69+
'max_DO_sample_rate': 1000000.0,
70+
'min_semiperiod_measurement': 1e-07,
71+
'num_AI': 32,
72+
'num_AO': 4,
73+
'num_CI': 4,
74+
'ports': {
75+
'port0': {'num_lines': 32, 'supports_buffered': True},
76+
'port1': {'num_lines': 8, 'supports_buffered': False},
77+
'port2': {'num_lines': 8, 'supports_buffered': False},
78+
},
79+
'supports_buffered_AO': True,
80+
'supports_buffered_DO': True,
81+
'supports_semiperiod_measurement': True,
82+
'supports_simultaneous_AI_sampling': False,
83+
}
84+
85+
86+
class NI_PCIe_6343(NI_DAQmx):
87+
description = 'NI-PCIe-6343'
88+
89+
def __init__(self, *args, **kwargs):
90+
"""Class for NI-PCIe-6343"""
91+
# Any provided kwargs take precedent over capabilities
92+
combined_kwargs = CAPABILITIES.copy()
93+
combined_kwargs.update(kwargs)
94+
NI_DAQmx.__init__(self, *args, **combined_kwargs)

‎labscript_devices/NI_DAQmx/models/NI_PCIe_6363.py‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,43 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': [-10.0, 10.0],
28+
'AI_range_Diff': [-10.0, 10.0],
2829
'AI_start_delay': 7e-08,
30+
'AI_term': 'RSE',
31+
'AI_term_cfg': {
32+
'ai0': ['RSE', 'NRSE', 'Diff'],
33+
'ai1': ['RSE', 'NRSE', 'Diff'],
34+
'ai10': ['RSE', 'NRSE'],
35+
'ai11': ['RSE', 'NRSE'],
36+
'ai12': ['RSE', 'NRSE'],
37+
'ai13': ['RSE', 'NRSE'],
38+
'ai14': ['RSE', 'NRSE'],
39+
'ai15': ['RSE', 'NRSE'],
40+
'ai16': ['RSE', 'NRSE', 'Diff'],
41+
'ai17': ['RSE', 'NRSE', 'Diff'],
42+
'ai18': ['RSE', 'NRSE', 'Diff'],
43+
'ai19': ['RSE', 'NRSE', 'Diff'],
44+
'ai2': ['RSE', 'NRSE', 'Diff'],
45+
'ai20': ['RSE', 'NRSE', 'Diff'],
46+
'ai21': ['RSE', 'NRSE', 'Diff'],
47+
'ai22': ['RSE', 'NRSE', 'Diff'],
48+
'ai23': ['RSE', 'NRSE', 'Diff'],
49+
'ai24': ['RSE', 'NRSE'],
50+
'ai25': ['RSE', 'NRSE'],
51+
'ai26': ['RSE', 'NRSE'],
52+
'ai27': ['RSE', 'NRSE'],
53+
'ai28': ['RSE', 'NRSE'],
54+
'ai29': ['RSE', 'NRSE'],
55+
'ai3': ['RSE', 'NRSE', 'Diff'],
56+
'ai30': ['RSE', 'NRSE'],
57+
'ai31': ['RSE', 'NRSE'],
58+
'ai4': ['RSE', 'NRSE', 'Diff'],
59+
'ai5': ['RSE', 'NRSE', 'Diff'],
60+
'ai6': ['RSE', 'NRSE', 'Diff'],
61+
'ai7': ['RSE', 'NRSE', 'Diff'],
62+
'ai8': ['RSE', 'NRSE'],
63+
'ai9': ['RSE', 'NRSE'],
64+
},
2965
'AO_range': [-10.0, 10.0],
3066
'max_AI_multi_chan_rate': 1000000.0,
3167
'max_AI_single_chan_rate': 2000000.0,
@@ -43,6 +79,7 @@
4379
'supports_buffered_AO': True,
4480
'supports_buffered_DO': True,
4581
'supports_semiperiod_measurement': True,
82+
'supports_simultaneous_AI_sampling': False,
4683
}
4784

4885

‎labscript_devices/NI_DAQmx/models/NI_PCIe_6738.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': None,
28+
'AI_range_Diff': None,
2829
'AI_start_delay': None,
2930
'AO_range': [-10.0, 10.0],
3031
'max_AI_multi_chan_rate': None,

‎labscript_devices/NI_DAQmx/models/NI_PXI_6733.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': None,
28+
'AI_range_Diff': None,
2829
'AI_start_delay': None,
2930
'AO_range': [-10.0, 10.0],
3031
'max_AI_multi_chan_rate': None,

‎labscript_devices/NI_DAQmx/models/NI_PXIe_6361.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,27 @@
2525
#:
2626
CAPABILITIES = {
2727
'AI_range': [-10.0, 10.0],
28+
'AI_range_Diff': [-10.0, 10.0],
2829
'AI_start_delay': 7e-08,
30+
'AI_term': 'RSE',
31+
'AI_term_cfg': {
32+
'ai0': ['RSE', 'NRSE', 'Diff'],
33+
'ai1': ['RSE', 'NRSE', 'Diff'],
34+
'ai10': ['RSE', 'NRSE'],
35+
'ai11': ['RSE', 'NRSE'],
36+
'ai12': ['RSE', 'NRSE'],
37+
'ai13': ['RSE', 'NRSE'],
38+
'ai14': ['RSE', 'NRSE'],
39+
'ai15': ['RSE', 'NRSE'],
40+
'ai2': ['RSE', 'NRSE', 'Diff'],
41+
'ai3': ['RSE', 'NRSE', 'Diff'],
42+
'ai4': ['RSE', 'NRSE', 'Diff'],
43+
'ai5': ['RSE', 'NRSE', 'Diff'],
44+
'ai6': ['RSE', 'NRSE', 'Diff'],
45+
'ai7': ['RSE', 'NRSE', 'Diff'],
46+
'ai8': ['RSE', 'NRSE'],
47+
'ai9': ['RSE', 'NRSE'],
48+
},
2949
'AO_range': [-10.0, 10.0],
3050
'max_AI_multi_chan_rate': 1000000.0,
3151
'max_AI_single_chan_rate': 2000000.0,
@@ -43,6 +63,7 @@
4363
'supports_buffered_AO': True,
4464
'supports_buffered_DO': True,
4565
'supports_semiperiod_measurement': True,
66+
'supports_simultaneous_AI_sampling': False,
4667
}
4768

4869

0 commit comments

Comments
 (0)