Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .config/cspell/daqmx-api-elements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ physicalChannel # unseparated words
posssible # Typo; should be: possible
pretrig # abbreviation; pre-trigger
prpty # abbreviation; property
Ptrs # abbreviation; pointers
rangeWith # unseparated words
regen # abbreviation; regeneration
rngs # abbreviation; ranges
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ All notable changes to this project will be documented in this file.
* ...

* ### Major Changes
* ...
* Add support for Analog Path Delay

* ### Known Issues
* ...
Expand Down
740 changes: 370 additions & 370 deletions generated/nidaqmx/_stubs/nidaqmx_pb2.py

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion generated/nidaqmx/_stubs/nidaqmx_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@generated by mypy-protobuf. Do not edit manually!
isort:skip_file
---------------------------------------------------------------------
This file is generated from NI-DAQMX API metadata version 26.0.0
This file is generated from NI-DAQMX API metadata version 26.8.0
---------------------------------------------------------------------
Proto file for the NI-DAQMX Metadata
---------------------------------------------------------------------
Expand Down Expand Up @@ -347,6 +347,7 @@ class _ChannelInt32AttributeEnumTypeWrapper(google.protobuf.internal.enum_type_w
CHANNEL_ATTRIBUTE_PWR_IDLE_OUTPUT_BEHAVIOR: _ChannelInt32Attribute.ValueType # 12760
CHANNEL_ATTRIBUTE_PWR_REMOTE_SENSE: _ChannelInt32Attribute.ValueType # 12763
CHANNEL_ATTRIBUTE_AI_POWER_UNITS: _ChannelInt32Attribute.ValueType # 12780
CHANNEL_ATTRIBUTE_AI_ANALOG_PATH_DELAY_UNITS: _ChannelInt32Attribute.ValueType # 12792

class ChannelInt32Attribute(_ChannelInt32Attribute, metaclass=_ChannelInt32AttributeEnumTypeWrapper): ...

Expand Down Expand Up @@ -553,6 +554,7 @@ CHANNEL_ATTRIBUTE_PWR_OUTPUT_STATE: ChannelInt32Attribute.ValueType # 12759
CHANNEL_ATTRIBUTE_PWR_IDLE_OUTPUT_BEHAVIOR: ChannelInt32Attribute.ValueType # 12760
CHANNEL_ATTRIBUTE_PWR_REMOTE_SENSE: ChannelInt32Attribute.ValueType # 12763
CHANNEL_ATTRIBUTE_AI_POWER_UNITS: ChannelInt32Attribute.ValueType # 12780
CHANNEL_ATTRIBUTE_AI_ANALOG_PATH_DELAY_UNITS: ChannelInt32Attribute.ValueType # 12792
global___ChannelInt32Attribute = ChannelInt32Attribute

class _ChannelDoubleAttribute:
Expand Down Expand Up @@ -744,6 +746,7 @@ class _ChannelDoubleAttributeEnumTypeWrapper(google.protobuf.internal.enum_type_
CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_VOLTAGE_MIN: _ChannelDoubleAttribute.ValueType # 12782
CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MAX: _ChannelDoubleAttribute.ValueType # 12783
CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MIN: _ChannelDoubleAttribute.ValueType # 12784
CHANNEL_ATTRIBUTE_AI_ANALOG_PATH_DELAY: _ChannelDoubleAttribute.ValueType # 12791

class ChannelDoubleAttribute(_ChannelDoubleAttribute, metaclass=_ChannelDoubleAttributeEnumTypeWrapper): ...

Expand Down Expand Up @@ -930,6 +933,7 @@ CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_VOLTAGE_MAX: ChannelDoubleAttribute.ValueT
CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_VOLTAGE_MIN: ChannelDoubleAttribute.ValueType # 12782
CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MAX: ChannelDoubleAttribute.ValueType # 12783
CHANNEL_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MIN: ChannelDoubleAttribute.ValueType # 12784
CHANNEL_ATTRIBUTE_AI_ANALOG_PATH_DELAY: ChannelDoubleAttribute.ValueType # 12791
global___ChannelDoubleAttribute = ChannelDoubleAttribute

class _ChannelResetAttribute:
Expand Down Expand Up @@ -1502,6 +1506,8 @@ class _ChannelResetAttributeEnumTypeWrapper(google.protobuf.internal.enum_type_w
CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_VOLTAGE_MIN: _ChannelResetAttribute.ValueType # 12782
CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MAX: _ChannelResetAttribute.ValueType # 12783
CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MIN: _ChannelResetAttribute.ValueType # 12784
CHANNEL_RESET_ATTRIBUTE_AI_REMOVE_ANALOG_PATH_DELAY: _ChannelResetAttribute.ValueType # 12790
CHANNEL_RESET_ATTRIBUTE_AI_ANALOG_PATH_DELAY_UNITS: _ChannelResetAttribute.ValueType # 12792

class ChannelResetAttribute(_ChannelResetAttribute, metaclass=_ChannelResetAttributeEnumTypeWrapper): ...

Expand Down Expand Up @@ -2069,6 +2075,8 @@ CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_VOLTAGE_MAX: ChannelResetAttribute.V
CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_VOLTAGE_MIN: ChannelResetAttribute.ValueType # 12782
CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MAX: ChannelResetAttribute.ValueType # 12783
CHANNEL_RESET_ATTRIBUTE_AI_CALCULATED_POWER_CURRENT_MIN: ChannelResetAttribute.ValueType # 12784
CHANNEL_RESET_ATTRIBUTE_AI_REMOVE_ANALOG_PATH_DELAY: ChannelResetAttribute.ValueType # 12790
CHANNEL_RESET_ATTRIBUTE_AI_ANALOG_PATH_DELAY_UNITS: ChannelResetAttribute.ValueType # 12792
global___ChannelResetAttribute = ChannelResetAttribute

class _ChannelBoolAttribute:
Expand Down Expand Up @@ -2175,6 +2183,7 @@ class _ChannelBoolAttributeEnumTypeWrapper(google.protobuf.internal.enum_type_wr
CHANNEL_ATTRIBUTE_AI_OVERCURRENT_DETECT_ENABLE: _ChannelBoolAttribute.ValueType # 12692
CHANNEL_ATTRIBUTE_CI_FILTER_ENABLE: _ChannelBoolAttribute.ValueType # 12727
CHANNEL_ATTRIBUTE_PWR_OUTPUT_ENABLE: _ChannelBoolAttribute.ValueType # 12758
CHANNEL_ATTRIBUTE_AI_REMOVE_ANALOG_PATH_DELAY: _ChannelBoolAttribute.ValueType # 12790

class ChannelBoolAttribute(_ChannelBoolAttribute, metaclass=_ChannelBoolAttributeEnumTypeWrapper): ...

Expand Down Expand Up @@ -2276,6 +2285,7 @@ CHANNEL_ATTRIBUTE_AI_POWER_SUPPLY_FAULT_DETECT_ENABLE: ChannelBoolAttribute.Valu
CHANNEL_ATTRIBUTE_AI_OVERCURRENT_DETECT_ENABLE: ChannelBoolAttribute.ValueType # 12692
CHANNEL_ATTRIBUTE_CI_FILTER_ENABLE: ChannelBoolAttribute.ValueType # 12727
CHANNEL_ATTRIBUTE_PWR_OUTPUT_ENABLE: ChannelBoolAttribute.ValueType # 12758
CHANNEL_ATTRIBUTE_AI_REMOVE_ANALOG_PATH_DELAY: ChannelBoolAttribute.ValueType # 12790
global___ChannelBoolAttribute = ChannelBoolAttribute

class _ChannelStringAttribute:
Expand Down Expand Up @@ -6914,6 +6924,7 @@ class _UnitsPreScaledEnumTypeWrapper(google.protobuf.internal.enum_type_wrapper.
UNITS_PRE_SCALED_UNSPECIFIED: _UnitsPreScaled.ValueType # 0
UNITS_PRE_SCALED_VOLTS: _UnitsPreScaled.ValueType # 10348
UNITS_PRE_SCALED_AMPS: _UnitsPreScaled.ValueType # 10342
UNITS_PRE_SCALED_WATTS: _UnitsPreScaled.ValueType # 16203
UNITS_PRE_SCALED_DEG_F: _UnitsPreScaled.ValueType # 10144
UNITS_PRE_SCALED_DEG_C: _UnitsPreScaled.ValueType # 10143
UNITS_PRE_SCALED_DEG_R: _UnitsPreScaled.ValueType # 10145
Expand Down Expand Up @@ -6956,6 +6967,7 @@ class UnitsPreScaled(_UnitsPreScaled, metaclass=_UnitsPreScaledEnumTypeWrapper):
UNITS_PRE_SCALED_UNSPECIFIED: UnitsPreScaled.ValueType # 0
UNITS_PRE_SCALED_VOLTS: UnitsPreScaled.ValueType # 10348
UNITS_PRE_SCALED_AMPS: UnitsPreScaled.ValueType # 10342
UNITS_PRE_SCALED_WATTS: UnitsPreScaled.ValueType # 16203
UNITS_PRE_SCALED_DEG_F: UnitsPreScaled.ValueType # 10144
UNITS_PRE_SCALED_DEG_C: UnitsPreScaled.ValueType # 10143
UNITS_PRE_SCALED_DEG_R: UnitsPreScaled.ValueType # 10145
Expand Down Expand Up @@ -8512,6 +8524,7 @@ class _ScaleInt32AttributeValuesEnumTypeWrapper(google.protobuf.internal.enum_ty
SCALE_INT32_SCALE_TYPE_TABLE: _ScaleInt32AttributeValues.ValueType # 10450
SCALE_INT32_UNITS_PRE_SCALED_VOLTS: _ScaleInt32AttributeValues.ValueType # 10348
SCALE_INT32_UNITS_PRE_SCALED_AMPS: _ScaleInt32AttributeValues.ValueType # 10342
SCALE_INT32_UNITS_PRE_SCALED_WATTS: _ScaleInt32AttributeValues.ValueType # 16203
SCALE_INT32_UNITS_PRE_SCALED_DEG_F: _ScaleInt32AttributeValues.ValueType # 10144
SCALE_INT32_UNITS_PRE_SCALED_DEG_C: _ScaleInt32AttributeValues.ValueType # 10143
SCALE_INT32_UNITS_PRE_SCALED_DEG_R: _ScaleInt32AttributeValues.ValueType # 10145
Expand Down Expand Up @@ -8558,6 +8571,7 @@ SCALE_INT32_SCALE_TYPE_POLYNOMIAL: ScaleInt32AttributeValues.ValueType # 10449
SCALE_INT32_SCALE_TYPE_TABLE: ScaleInt32AttributeValues.ValueType # 10450
SCALE_INT32_UNITS_PRE_SCALED_VOLTS: ScaleInt32AttributeValues.ValueType # 10348
SCALE_INT32_UNITS_PRE_SCALED_AMPS: ScaleInt32AttributeValues.ValueType # 10342
SCALE_INT32_UNITS_PRE_SCALED_WATTS: ScaleInt32AttributeValues.ValueType # 16203
SCALE_INT32_UNITS_PRE_SCALED_DEG_F: ScaleInt32AttributeValues.ValueType # 10144
SCALE_INT32_UNITS_PRE_SCALED_DEG_C: ScaleInt32AttributeValues.ValueType # 10143
SCALE_INT32_UNITS_PRE_SCALED_DEG_R: ScaleInt32AttributeValues.ValueType # 10145
Expand Down
2 changes: 1 addition & 1 deletion generated/nidaqmx/_stubs/nidaqmx_pb2_grpc.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@generated by mypy-protobuf. Do not edit manually!
isort:skip_file
---------------------------------------------------------------------
This file is generated from NI-DAQMX API metadata version 26.0.0
This file is generated from NI-DAQMX API metadata version 26.8.0
---------------------------------------------------------------------
Proto file for the NI-DAQMX Metadata
---------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions generated/nidaqmx/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,7 @@ class UnderflowBehavior(Enum):
class UnitsPreScaled(Enum):
VOLTS = 10348 #: Volts.
AMPS = 10342 #: Amperes.
WATTS = 16203 #: Watts.
DEG_F = 10144 #: Degrees Fahrenheit.
DEG_C = 10143 #: Degrees Celsius.
DEG_R = 10145 #: Degrees Rankine.
Expand Down
48 changes: 48 additions & 0 deletions generated/nidaqmx/task/channels/_ai_channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,36 @@ def ai_adc_timing_mode(self, val):
def ai_adc_timing_mode(self):
self._interpreter.reset_chan_attribute(self._handle, self._name, 0x29f9)

@property
def ai_analog_path_delay(self):
"""
float: Indicates the analog path delay for the channel's
configuration. This value is in the units you specify with
**ai_analog_path_delay_units**.
"""

val = self._interpreter.get_chan_attribute_double(self._handle, self._name, 0x31f7)
return val

@property
def ai_analog_path_delay_units(self):
"""
:class:`nidaqmx.constants.DigitalWidthUnits`: Specifies the
units for **ai_analog_path_delay**.
"""

val = self._interpreter.get_chan_attribute_int32(self._handle, self._name, 0x31f8)
return DigitalWidthUnits(val)

@ai_analog_path_delay_units.setter
def ai_analog_path_delay_units(self, val):
val = val.value
self._interpreter.set_chan_attribute_int32(self._handle, self._name, 0x31f8, val)

@ai_analog_path_delay_units.deleter
def ai_analog_path_delay_units(self):
self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31f8)

@property
def ai_atten(self):
"""
Expand Down Expand Up @@ -2591,6 +2621,24 @@ def ai_raw_samp_size(self):
val = self._interpreter.get_chan_attribute_uint32(self._handle, self._name, 0x22da)
return val

@property
def ai_remove_analog_path_delay(self):
"""
bool: Specifies whether to remove the analog path delay from the
timing path on the device.
"""

val = self._interpreter.get_chan_attribute_bool(self._handle, self._name, 0x31f6)
return val

@ai_remove_analog_path_delay.setter
def ai_remove_analog_path_delay(self, val):
self._interpreter.set_chan_attribute_bool(self._handle, self._name, 0x31f6, val)

@ai_remove_analog_path_delay.deleter
def ai_remove_analog_path_delay(self):
self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31f6)

@property
def ai_remove_filter_delay(self):
"""
Expand Down
94 changes: 94 additions & 0 deletions src/codegen/metadata/attributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -18905,6 +18905,100 @@
'python_description': 'Specifies the current minimum value you expect to measure. This value is in the units you specify with a units property. When you query this property, it returns the coerced current minimum value that the device can measure with the current settings.',
'resettable': True,
'type': 'float64'
},
12790: {
'access': 'read-write',
'c_function_name': 'AIRemoveAnalogPathDelay',
'calling_convention': 'StdCall',
'ctypes_data_type': 'c_bool32',
'handle_parameters': {
'channelHandle': {
'accessor': 'self._name',
'ctypes_data_type': 'ctypes.c_char_p',
'cvi_name': 'channel'
},
'taskHandle': {
'accessor': 'self._handle',
'ctypes_data_type': 'lib_importer.task_handle',
'cvi_name': 'taskHandle'
}
},
'has_explicit_read_buffer_size': False,
'has_explicit_write_buffer_size': False,
'is_list': False,
'is_python_object': False,
'lv_filter': [
'Channel'
],
'name': 'AI_REMOVE_ANALOG_PATH_DELAY',
'python_class_name': 'AIChannel',
'python_data_type': 'bool',
'python_description': 'Specifies whether to remove the analog path delay from the timing path on the device.',
'resettable': True,
'type': 'bool32'
},
12791: {
'access': 'read',
'c_function_name': 'AIAnalogPathDelay',
'calling_convention': 'StdCall',
'ctypes_data_type': 'ctypes.c_double',
'handle_parameters': {
'channelHandle': {
'accessor': 'self._name',
'ctypes_data_type': 'ctypes.c_char_p',
'cvi_name': 'channel'
},
'taskHandle': {
'accessor': 'self._handle',
'ctypes_data_type': 'lib_importer.task_handle',
'cvi_name': 'taskHandle'
}
},
'has_explicit_read_buffer_size': False,
'has_explicit_write_buffer_size': False,
'is_list': False,
'is_python_object': False,
'lv_filter': [
'Channel'
],
'name': 'AI_ANALOG_PATH_DELAY',
'python_class_name': 'AIChannel',
'python_data_type': 'float',
'python_description': "Indicates the analog path delay for the channel's configuration. This value is in the units you specify with **ai_analog_path_delay_units**.",
'resettable': False,
'type': 'float64'
},
12792: {
'access': 'read-write',
'c_function_name': 'AIAnalogPathDelayUnits',
'calling_convention': 'StdCall',
'ctypes_data_type': 'ctypes.c_int',
'enum': 'DigitalWidthUnits4',
'handle_parameters': {
'channelHandle': {
'accessor': 'self._name',
'ctypes_data_type': 'ctypes.c_char_p',
'cvi_name': 'channel'
},
'taskHandle': {
'accessor': 'self._handle',
'ctypes_data_type': 'lib_importer.task_handle',
'cvi_name': 'taskHandle'
}
},
'has_explicit_read_buffer_size': False,
'has_explicit_write_buffer_size': False,
'is_list': False,
'is_python_object': False,
'lv_filter': [
'Channel'
],
'name': 'AI_ANALOG_PATH_DELAY_UNITS',
'python_class_name': 'AIChannel',
'python_data_type': 'DigitalWidthUnits4',
'python_description': 'Specifies the units for **ai_analog_path_delay**.',
'resettable': True,
'type': 'int32'
}
},
'Device': {
Expand Down
7 changes: 7 additions & 0 deletions src/codegen/metadata/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -18594,6 +18594,13 @@
'name': 'AMPS',
'value': 10342
},
{
'documentation': {
'description': 'Watts.'
},
'name': 'WATTS',
'value': 16203
},
{
'documentation': {
'description': 'Degrees Fahrenheit.'
Expand Down
Loading