[26Q1] Add features from DAQmx 26.0 release (Calculated Power and A, C-type Thermocouples) (#876)

* add DAQmxCreateAICalculatedPowerChan python api

* Fix formatting

* Fix codegen error

* Add grpc codegen error workaround

* Remove waveform changes from nidaqmx proto

* Fix PR build

* Remove waveform channges from function metadata

* Update Changelog

* Update nidaqmx MAX config file

* Resolve merge conflict

* Update 26Q1 MAX config files

Author: HSKhor-NI

CHANGELOG.md

@@ -35,6 +35,8 @@ All notable changes to this project will be documented in this file.
 
 * ### Major Changes
     * (IN PROGRESS behind "WAVEFORM_SUPPORT" feature toggle) Added support for reading and writing Waveform data through gRPC using [NI gRPC Device Server](https://github.com/ni/grpc-device).
+    * Add support for calculated power channels
+    * Add support for A and C-type Thermocouples
 
 * ### Known Issues
     * ...

generated/nidaqmx/_base_interpreter.py

@@ -229,6 +229,14 @@ def create_ai_bridge_chan(
             voltage_excit_val, nominal_bridge_resistance, custom_scale_name):
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def create_ai_calculated_power_chan(
+            self, task, voltage_physical_channel, current_physical_channel,
+            name_to_assign_to_channel, terminal_config, voltage_min_val,
+            voltage_max_val, current_min_val, current_max_val, units,
+            shunt_resistor_loc, ext_shunt_resistor_val, custom_scale_name):
+        raise NotImplementedError
+
     @abc.abstractmethod
     def create_ai_charge_chan(
             self, task, physical_channel, name_to_assign_to_channel,

generated/nidaqmx/_grpc_interpreter.py

@@ -539,6 +539,26 @@ def create_ai_bridge_chan(
                 nominal_bridge_resistance=nominal_bridge_resistance,
                 custom_scale_name=custom_scale_name))
 
+    def create_ai_calculated_power_chan(
+            self, task, voltage_physical_channel, current_physical_channel,
+            name_to_assign_to_channel, terminal_config, voltage_min_val,
+            voltage_max_val, current_min_val, current_max_val, units,
+            shunt_resistor_loc, ext_shunt_resistor_val, custom_scale_name):
+        response = self._invoke(
+            self._client.CreateAICalculatedPowerChan,
+            grpc_types.CreateAICalculatedPowerChanRequest(
+                task=task, voltage_physical_channel=voltage_physical_channel,
+                current_physical_channel=current_physical_channel,
+                name_to_assign_to_channel=name_to_assign_to_channel,
+                terminal_config_raw=terminal_config,
+                voltage_min_val=voltage_min_val,
+                voltage_max_val=voltage_max_val,
+                current_min_val=current_min_val,
+                current_max_val=current_max_val, units_raw=units,
+                shunt_resistor_loc_raw=shunt_resistor_loc,
+                ext_shunt_resistor_val=ext_shunt_resistor_val,
+                custom_scale_name=custom_scale_name))
+
     def create_ai_charge_chan(
             self, task, physical_channel, name_to_assign_to_channel,
             terminal_config, min_val, max_val, units, custom_scale_name):

generated/nidaqmx/_library_interpreter.py

@@ -696,6 +696,29 @@ def create_ai_bridge_chan(
             voltage_excit_val, nominal_bridge_resistance, custom_scale_name)
         self.check_for_error(error_code)
 
+    def create_ai_calculated_power_chan(
+            self, task, voltage_physical_channel, current_physical_channel,
+            name_to_assign_to_channel, terminal_config, voltage_min_val,
+            voltage_max_val, current_min_val, current_max_val, units,
+            shunt_resistor_loc, ext_shunt_resistor_val, custom_scale_name):
+        cfunc = lib_importer.windll.DAQmxCreateAICalculatedPowerChan
+        if cfunc.argtypes is None:
+            with cfunc.arglock:
+                if cfunc.argtypes is None:
+                    cfunc.argtypes = [
+                        lib_importer.task_handle, ctypes_byte_str,
+                        ctypes_byte_str, ctypes_byte_str, ctypes.c_int,
+                        ctypes.c_double, ctypes.c_double, ctypes.c_double,
+                        ctypes.c_double, ctypes.c_int, ctypes.c_int,
+                        ctypes.c_double, ctypes_byte_str]
+
+        error_code = cfunc(
+            task, voltage_physical_channel, current_physical_channel,
+            name_to_assign_to_channel, terminal_config, voltage_min_val,
+            voltage_max_val, current_min_val, current_max_val, units,
+            shunt_resistor_loc, ext_shunt_resistor_val, custom_scale_name)
+        self.check_for_error(error_code)
+
     def create_ai_charge_chan(
             self, task, physical_channel, name_to_assign_to_channel,
             terminal_config, min_val, max_val, units, custom_scale_name):

generated/nidaqmx/_stubs/nidaqmx_pb2.py

@@ -209,6 +209,11 @@ def __init__(self, channel):
                 request_serializer=nidaqmx__pb2.CreateAIBridgeChanRequest.SerializeToString,
                 response_deserializer=nidaqmx__pb2.CreateAIBridgeChanResponse.FromString,
                 )
+        self.CreateAICalculatedPowerChan = channel.unary_unary(
+                '/nidaqmx_grpc.NiDAQmx/CreateAICalculatedPowerChan',
+                request_serializer=nidaqmx__pb2.CreateAICalculatedPowerChanRequest.SerializeToString,
+                response_deserializer=nidaqmx__pb2.CreateAICalculatedPowerChanResponse.FromString,
+                )
         self.CreateAIChargeChan = channel.unary_unary(
                 '/nidaqmx_grpc.NiDAQmx/CreateAIChargeChan',
                 request_serializer=nidaqmx__pb2.CreateAIChargeChanRequest.SerializeToString,
@@ -2503,6 +2508,12 @@ def CreateAIBridgeChan(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def CreateAICalculatedPowerChan(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
     def CreateAIChargeChan(self, request, context):
         """Missing associated documentation comment in .proto file."""
         context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -5167,6 +5178,11 @@ def add_NiDAQmxServicer_to_server(servicer, server):
                     request_deserializer=nidaqmx__pb2.CreateAIBridgeChanRequest.FromString,
                     response_serializer=nidaqmx__pb2.CreateAIBridgeChanResponse.SerializeToString,
             ),
+            'CreateAICalculatedPowerChan': grpc.unary_unary_rpc_method_handler(
+                    servicer.CreateAICalculatedPowerChan,
+                    request_deserializer=nidaqmx__pb2.CreateAICalculatedPowerChanRequest.FromString,
+                    response_serializer=nidaqmx__pb2.CreateAICalculatedPowerChanResponse.SerializeToString,
+            ),
             'CreateAIChargeChan': grpc.unary_unary_rpc_method_handler(
                     servicer.CreateAIChargeChan,
                     request_deserializer=nidaqmx__pb2.CreateAIChargeChanRequest.FromString,
@@ -7895,6 +7911,23 @@ def CreateAIBridgeChan(request,
             options, channel_credentials,
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
 
+    @staticmethod
+    def CreateAICalculatedPowerChan(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(request, target, '/nidaqmx_grpc.NiDAQmx/CreateAICalculatedPowerChan',
+            nidaqmx__pb2.CreateAICalculatedPowerChanRequest.SerializeToString,
+            nidaqmx__pb2.CreateAICalculatedPowerChanResponse.FromString,
+            options, channel_credentials,
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
     @staticmethod
     def CreateAIChargeChan(request,
             target,

generated/nidaqmx/_stubs/nidaqmx_pb2.pyi

@@ -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 23.0.0
+This file is generated from NI-DAQMX API metadata version 26.0.0
 ---------------------------------------------------------------------
 Proto file for the NI-DAQMX Metadata
 ---------------------------------------------------------------------
@@ -219,6 +219,11 @@ class NiDAQmxStub:
         nidaqmx_pb2.CreateAIBridgeChanResponse,
     ]
 
+    CreateAICalculatedPowerChan: grpc.UnaryUnaryMultiCallable[
+        nidaqmx_pb2.CreateAICalculatedPowerChanRequest,
+        nidaqmx_pb2.CreateAICalculatedPowerChanResponse,
+    ]
+
     CreateAIChargeChan: grpc.UnaryUnaryMultiCallable[
         nidaqmx_pb2.CreateAIChargeChanRequest,
         nidaqmx_pb2.CreateAIChargeChanResponse,
@@ -2470,6 +2475,11 @@ class NiDAQmxAsyncStub:
         nidaqmx_pb2.CreateAIBridgeChanResponse,
     ]
 
+    CreateAICalculatedPowerChan: grpc.aio.UnaryUnaryMultiCallable[
+        nidaqmx_pb2.CreateAICalculatedPowerChanRequest,
+        nidaqmx_pb2.CreateAICalculatedPowerChanResponse,
+    ]
+
     CreateAIChargeChan: grpc.aio.UnaryUnaryMultiCallable[
         nidaqmx_pb2.CreateAIChargeChanRequest,
         nidaqmx_pb2.CreateAIChargeChanResponse,
@@ -4799,6 +4809,13 @@ class NiDAQmxServicer(metaclass=abc.ABCMeta):
         context: _ServicerContext,
     ) -> typing.Union[nidaqmx_pb2.CreateAIBridgeChanResponse, collections.abc.Awaitable[nidaqmx_pb2.CreateAIBridgeChanResponse]]: ...
 
+    @abc.abstractmethod
+    def CreateAICalculatedPowerChan(
+        self,
+        request: nidaqmx_pb2.CreateAICalculatedPowerChanRequest,
+        context: _ServicerContext,
+    ) -> typing.Union[nidaqmx_pb2.CreateAICalculatedPowerChanResponse, collections.abc.Awaitable[nidaqmx_pb2.CreateAICalculatedPowerChanResponse]]: ...
+
     @abc.abstractmethod
     def CreateAIChargeChan(
         self,

generated/nidaqmx/_stubs/nidaqmx_pb2_grpc.py

@@ -479,6 +479,11 @@ class PowerOutputState(Enum):
     OUTPUT_DISABLED = 15503  #: Power output is disabled.
 
 
+class PowerUnits(Enum):
+    WATTS = 16203  #: Watts.
+    FROM_CUSTOM_SCALE = 10065  #: Units a custom scale specifies. If you select this value, you must specify a custom scale name.
+
+
 class PowerUpChannelType(Enum):
     CHANNEL_VOLTAGE = 0  #: Voltage Channel
     CHANNEL_CURRENT = 1  #: Current Channel
@@ -773,6 +778,8 @@ class ThermocoupleType(Enum):
     T = 10086  #: T-type thermocouple.
     B = 10047  #: B-type thermocouple.
     E = 10055  #: E-type thermocouple.
+    A = 16208  #: A-type thermocouple.
+    C = 16209  #: C-type thermocouple.
 
 
 class TimeUnits(Enum):

generated/nidaqmx/_stubs/nidaqmx_pb2_grpc.pyi

@@ -18,14 +18,15 @@
     ExcitationVoltageOrCurrent, FilterResponse, FilterType,
     ForceIEPESensorSensitivityUnits, ForceUnits, FrequencyUnits, Impedance1,
     InputDataTransferCondition, LVDTSensitivityUnits, LengthUnits,
-    PowerIdleOutputBehavior, PowerOutputState, PressureUnits, RTDType,
-    RVDTSensitivityUnits, RawDataCompressionType, ResistanceConfiguration,
-    ResistanceUnits, ResolutionType, ScaleType, Sense, SensorPowerCfg,
-    SensorPowerType, ShuntCalSelect, SoundPressureUnits, SourceSelection,
-    StrainGageBridgeType, StrainGageRosetteMeasurementType,
-    StrainGageRosetteType, StrainUnits, TemperatureUnits,
-    TerminalConfiguration, ThermocoupleType, TorqueUnits, UsageTypeAI,
-    VelocityIEPESensorSensitivityUnits, VelocityUnits, VoltageUnits)
+    PowerIdleOutputBehavior, PowerOutputState, PowerUnits, PressureUnits,
+    RTDType, RVDTSensitivityUnits, RawDataCompressionType,
+    ResistanceConfiguration, ResistanceUnits, ResolutionType, ScaleType,
+    Sense, SensorPowerCfg, SensorPowerType, ShuntCalSelect,
+    SoundPressureUnits, SourceSelection, StrainGageBridgeType,
+    StrainGageRosetteMeasurementType, StrainGageRosetteType, StrainUnits,
+    TemperatureUnits, TerminalConfiguration, ThermocoupleType, TorqueUnits,
+    UsageTypeAI, VelocityIEPESensorSensitivityUnits, VelocityUnits,
+    VoltageUnits)
 
 
 class AIChannel(Channel):
@@ -882,6 +883,90 @@ def ai_bridge_units(self, val):
     def ai_bridge_units(self):
         self._interpreter.reset_chan_attribute(self._handle, self._name, 0x2f92)
 
+    @property
+    def ai_calculated_power_current_max(self):
+        """
+        float: Specifies the current maximum 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 maximum value that the device can measure
+            with the current settings.
+        """
+
+        val = self._interpreter.get_chan_attribute_double(self._handle, self._name, 0x31ef)
+        return val
+
+    @ai_calculated_power_current_max.setter
+    def ai_calculated_power_current_max(self, val):
+        self._interpreter.set_chan_attribute_double(self._handle, self._name, 0x31ef, val)
+
+    @ai_calculated_power_current_max.deleter
+    def ai_calculated_power_current_max(self):
+        self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31ef)
+
+    @property
+    def ai_calculated_power_current_min(self):
+        """
+        float: 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.
+        """
+
+        val = self._interpreter.get_chan_attribute_double(self._handle, self._name, 0x31f0)
+        return val
+
+    @ai_calculated_power_current_min.setter
+    def ai_calculated_power_current_min(self, val):
+        self._interpreter.set_chan_attribute_double(self._handle, self._name, 0x31f0, val)
+
+    @ai_calculated_power_current_min.deleter
+    def ai_calculated_power_current_min(self):
+        self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31f0)
+
+    @property
+    def ai_calculated_power_voltage_max(self):
+        """
+        float: Specifies the voltage maximum 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 voltage maximum value that the device can measure
+            with the current settings.
+        """
+
+        val = self._interpreter.get_chan_attribute_double(self._handle, self._name, 0x31ed)
+        return val
+
+    @ai_calculated_power_voltage_max.setter
+    def ai_calculated_power_voltage_max(self, val):
+        self._interpreter.set_chan_attribute_double(self._handle, self._name, 0x31ed, val)
+
+    @ai_calculated_power_voltage_max.deleter
+    def ai_calculated_power_voltage_max(self):
+        self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31ed)
+
+    @property
+    def ai_calculated_power_voltage_min(self):
+        """
+        float: Specifies the voltage 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 voltage minimum value that the device can measure
+            with the current settings.
+        """
+
+        val = self._interpreter.get_chan_attribute_double(self._handle, self._name, 0x31ee)
+        return val
+
+    @ai_calculated_power_voltage_min.setter
+    def ai_calculated_power_voltage_min(self, val):
+        self._interpreter.set_chan_attribute_double(self._handle, self._name, 0x31ee, val)
+
+    @ai_calculated_power_voltage_min.deleter
+    def ai_calculated_power_voltage_min(self):
+        self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31ee)
+
     @property
     def ai_charge_units(self):
         """
@@ -2410,6 +2495,25 @@ def ai_power_supply_fault_detect_enable(self, val):
     def ai_power_supply_fault_detect_enable(self):
         self._interpreter.reset_chan_attribute(self._handle, self._name, 0x3191)
 
+    @property
+    def ai_power_units(self):
+        """
+        :class:`nidaqmx.constants.PowerUnits`: Specifies the units to
+            use to return power measurements from the channel.
+        """
+
+        val = self._interpreter.get_chan_attribute_int32(self._handle, self._name, 0x31ec)
+        return PowerUnits(val)
+
+    @ai_power_units.setter
+    def ai_power_units(self, val):
+        val = val.value
+        self._interpreter.set_chan_attribute_int32(self._handle, self._name, 0x31ec, val)
+
+    @ai_power_units.deleter
+    def ai_power_units(self):
+        self._interpreter.reset_chan_attribute(self._handle, self._name, 0x31ec)
+
     @property
     def ai_pressure_units(self):
         """