Skip to content

Commit 441569a

Browse files
WayneDroidWayneDroid
authored
Pick up new daqmx metadata (#608)
* Pick up new daqmx metadata * reverted readArray type in ReadRaw metadata
1 parent 8264bc2 commit 441569a

File tree

4 files changed

+97
-4
lines changed

4 files changed

+97
-4
lines changed

‎generated/nidaqmx/constants.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ class ProductCategory(Enum):
517517
FIELD_DAQ = 16151 #: FieldDAQ.
518518
TEST_SCALE_CHASSIS = 16180 #: TestScale chassis.
519519
TEST_SCALE_MODULE = 16181 #: TestScale I/O module.
520+
MIODAQ = 16182 #: mioDAQ.
520521
UNKNOWN = 12588 #: Unknown category.
521522

522523

‎generated/nidaqmx/error_codes.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77

88
class DAQmxErrors(IntEnum):
9+
NEEDS_USB_SUPER_SPEED = -209889
910
REMOTE_SENSE = -209888
1011
OVER_TEMPERATURE_PROTECTION_ACTIVATED = -209887
1112
MULTI_TASK_CFG_SAMP_RATE_NOT_SUPPORTED_WITH_PROP_SET = -209886

‎src/codegen/metadata/enums.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,6 +1484,13 @@
14841484
},
14851485
'DAQmxErrors': {
14861486
'values': [
1487+
{
1488+
'documentation': {
1489+
'description': ' '
1490+
},
1491+
'name': 'NEEDS_USB_SUPER_SPEED',
1492+
'value': -209889
1493+
},
14871494
{
14881495
'documentation': {
14891496
'description': ' '
@@ -16502,6 +16509,14 @@
1650216509
'name': 'TEST_SCALE_MODULE',
1650316510
'value': 16181
1650416511
},
16512+
{
16513+
'documentation': {
16514+
'description': 'mioDAQ.'
16515+
},
16516+
'name': 'MIO_DAQ',
16517+
'python_name': 'MIODAQ',
16518+
'value': 16182
16519+
},
1650516520
{
1650616521
'documentation': {
1650716522
'description': 'Unknown category.'

‎src/codegen/metadata/functions.py‎

Lines changed: 80 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13827,9 +13827,9 @@
1382713827
'direction': 'out',
1382813828
'is_optional_in_python': False,
1382913829
'name': 'logicFamily',
13830-
'python_data_type': 'int',
13830+
'python_data_type': 'LogicFamily',
1383113831
'python_description': '',
13832-
'python_type_annotation': 'int',
13832+
'python_type_annotation': 'nidaqmx.constants.LogicFamily',
1383313833
'type': 'int32'
1383413834
}
1383513835
],
@@ -19462,30 +19462,53 @@
1946219462
'calling_convention': 'StdCall',
1946319463
'parameters': [
1946419464
{
19465+
'ctypes_data_type': 'ctypes.TaskHandle',
1946519466
'direction': 'in',
19467+
'is_optional_in_python': False,
1946619468
'name': 'task',
19469+
'python_data_type': 'TaskHandle',
19470+
'python_description': '',
19471+
'python_type_annotation': 'TaskHandle',
1946719472
'type': 'TaskHandle'
1946819473
},
1946919474
{
19475+
'ctypes_data_type': 'ctypes.c_int',
1947019476
'direction': 'in',
19477+
'is_optional_in_python': False,
1947119478
'name': 'numSampsPerChan',
19479+
'python_data_type': 'int',
19480+
'python_description': '',
19481+
'python_type_annotation': 'int',
1947219482
'type': 'int32'
1947319483
},
1947419484
{
19485+
'ctypes_data_type': 'ctypes.c_double',
1947519486
'direction': 'in',
19487+
'is_optional_in_python': False,
1947619488
'name': 'timeout',
19489+
'python_data_type': 'float',
19490+
'python_description': '',
19491+
'python_type_annotation': 'float',
1947719492
'type': 'float64'
1947819493
},
1947919494
{
19495+
'ctypes_data_type': 'ctypes.c_int',
1948019496
'direction': 'in',
1948119497
'enum': 'GroupBy',
19498+
'is_optional_in_python': False,
1948219499
'name': 'fillMode',
19500+
'python_data_type': 'FillMode',
19501+
'python_description': '',
19502+
'python_type_annotation': 'nidaqmx.constants.FillMode',
1948319503
'type': 'int32'
1948419504
},
1948519505
{
1948619506
'coerced': True,
19507+
'ctypes_data_type': 'numpy.generic',
1948719508
'direction': 'out',
19509+
'is_list': True,
1948819510
'name': 'readArrayVoltage',
19511+
'python_data_type': 'object',
1948919512
'size': {
1949019513
'mechanism': 'passed-in',
1949119514
'value': 'arraySizeInSamps'
@@ -19494,101 +19517,154 @@
1949419517
},
1949519518
{
1949619519
'coerced': True,
19520+
'ctypes_data_type': 'numpy.generic',
1949719521
'direction': 'out',
19522+
'is_list': True,
1949819523
'name': 'readArrayCurrent',
19524+
'python_data_type': 'object',
1949919525
'size': {
1950019526
'mechanism': 'passed-in',
1950119527
'value': 'arraySizeInSamps'
1950219528
},
1950319529
'type': 'int16[]'
1950419530
},
1950519531
{
19532+
'ctypes_data_type': 'ctypes.c_uint32',
1950619533
'direction': 'in',
1950719534
'name': 'arraySizeInSamps',
19535+
'python_data_type': 'int',
1950819536
'type': 'uInt32'
1950919537
},
1951019538
{
19539+
'ctypes_data_type': 'ctypes.c_int',
1951119540
'direction': 'out',
19541+
'is_optional_in_python': False,
1951219542
'name': 'sampsPerChanRead',
19543+
'python_data_type': 'int',
19544+
'python_description': '',
19545+
'python_type_annotation': 'int',
1951319546
'return_on_error_key': 'ni-samps-per-chan-read',
1951419547
'type': 'int32'
1951519548
},
1951619549
{
19550+
'ctypes_data_type': 'c_bool32',
1951719551
'direction': 'in',
1951819552
'hardcoded_value': 'nullptr',
1951919553
'include_in_proto': False,
19554+
'is_optional_in_python': False,
1952019555
'name': 'reserved',
1952119556
'pointer': True,
19557+
'python_data_type': 'bool',
19558+
'python_description': '',
19559+
'python_type_annotation': 'bool',
1952219560
'type': 'bool32'
1952319561
}
1952419562
],
19525-
'python_codegen_method': 'no',
19563+
'python_codegen_method': 'CustomCode',
1952619564
'returns': 'int32',
1952719565
'timeout_error': 'DAQmxErrorSamplesNotYetAvailable'
1952819566
},
1952919567
'ReadPowerF64': {
1953019568
'calling_convention': 'StdCall',
1953119569
'parameters': [
1953219570
{
19571+
'ctypes_data_type': 'ctypes.TaskHandle',
1953319572
'direction': 'in',
19573+
'is_optional_in_python': False,
1953419574
'name': 'task',
19575+
'python_data_type': 'TaskHandle',
19576+
'python_description': '',
19577+
'python_type_annotation': 'TaskHandle',
1953519578
'type': 'TaskHandle'
1953619579
},
1953719580
{
19581+
'ctypes_data_type': 'ctypes.c_int',
1953819582
'direction': 'in',
19583+
'is_optional_in_python': False,
1953919584
'name': 'numSampsPerChan',
19585+
'python_data_type': 'int',
19586+
'python_description': '',
19587+
'python_type_annotation': 'int',
1954019588
'type': 'int32'
1954119589
},
1954219590
{
19591+
'ctypes_data_type': 'ctypes.c_double',
1954319592
'direction': 'in',
19593+
'is_optional_in_python': False,
1954419594
'name': 'timeout',
19595+
'python_data_type': 'float',
19596+
'python_description': '',
19597+
'python_type_annotation': 'float',
1954519598
'type': 'float64'
1954619599
},
1954719600
{
19601+
'ctypes_data_type': 'ctypes.c_int',
1954819602
'direction': 'in',
1954919603
'enum': 'GroupBy',
19604+
'is_optional_in_python': False,
1955019605
'name': 'fillMode',
19606+
'python_data_type': 'FillMode',
19607+
'python_description': '',
19608+
'python_type_annotation': 'nidaqmx.constants.FillMode',
1955119609
'type': 'int32'
1955219610
},
1955319611
{
19612+
'ctypes_data_type': 'numpy.float64',
1955419613
'direction': 'out',
19614+
'is_list': True,
1955519615
'name': 'readArrayVoltage',
19616+
'python_data_type': 'float',
1955619617
'size': {
1955719618
'mechanism': 'passed-in',
1955819619
'value': 'arraySizeInSamps'
1955919620
},
1956019621
'type': 'float64[]'
1956119622
},
1956219623
{
19624+
'ctypes_data_type': 'numpy.float64',
1956319625
'direction': 'out',
19626+
'is_list': True,
1956419627
'name': 'readArrayCurrent',
19628+
'python_data_type': 'float',
1956519629
'size': {
1956619630
'mechanism': 'passed-in',
1956719631
'value': 'arraySizeInSamps'
1956819632
},
1956919633
'type': 'float64[]'
1957019634
},
1957119635
{
19636+
'ctypes_data_type': 'ctypes.c_uint32',
1957219637
'direction': 'in',
1957319638
'name': 'arraySizeInSamps',
19639+
'python_data_type': 'int',
1957419640
'type': 'uInt32'
1957519641
},
1957619642
{
19643+
'ctypes_data_type': 'ctypes.c_int',
1957719644
'direction': 'out',
19645+
'is_optional_in_python': False,
1957819646
'name': 'sampsPerChanRead',
19647+
'python_data_type': 'int',
19648+
'python_description': '',
19649+
'python_type_annotation': 'int',
1957919650
'return_on_error_key': 'ni-samps-per-chan-read',
1958019651
'type': 'int32'
1958119652
},
1958219653
{
19654+
'ctypes_data_type': 'c_bool32',
1958319655
'direction': 'in',
1958419656
'hardcoded_value': 'nullptr',
1958519657
'include_in_proto': False,
19658+
'is_optional_in_python': False,
1958619659
'name': 'reserved',
1958719660
'pointer': True,
19661+
'python_data_type': 'bool',
19662+
'python_description': '',
19663+
'python_type_annotation': 'bool',
1958819664
'type': 'bool32'
1958919665
}
1959019666
],
19591-
'python_codegen_method': 'no',
19667+
'python_codegen_method': 'CustomCode',
1959219668
'returns': 'int32',
1959319669
'timeout_error': 'DAQmxErrorSamplesNotYetAvailable'
1959419670
},

0 commit comments

Comments
 (0)