updated metadata after resolving conflicts

Author: Vaishnavigupta1312

docs/nirfsg/class.rst

@@ -77,6 +77,7 @@ def __init__(self, ctypes_library):
         self.niRFSG_GetSelfCalibrationDateAndTime_cfunc = None
         self.niRFSG_GetSelfCalibrationTemperature_cfunc = None
         self.niRFSG_GetStreamEndpointHandle_cfunc = None
+        self.niRFSG_GetTerminalName_cfunc = None
         self.niRFSG_GetWaveformBurstStartLocations_cfunc = None
         self.niRFSG_GetWaveformBurstStopLocations_cfunc = None
         self.niRFSG_GetWaveformMarkerEventLocations_cfunc = None
@@ -586,6 +587,14 @@ def niRFSG_GetStreamEndpointHandle(self, vi, stream_endpoint, reader_handle):  #
                 self.niRFSG_GetStreamEndpointHandle_cfunc.restype = ViStatus  # noqa: F405
         return self.niRFSG_GetStreamEndpointHandle_cfunc(vi, stream_endpoint, reader_handle)
 
+    def niRFSG_GetTerminalName(self, vi, signal, signal_identifier, buffer_size, terminal_name):  # noqa: N802
+        with self._func_lock:
+            if self.niRFSG_GetTerminalName_cfunc is None:
+                self.niRFSG_GetTerminalName_cfunc = self._get_library_function('niRFSG_GetTerminalName')
+                self.niRFSG_GetTerminalName_cfunc.argtypes = [ViSession, ViInt32, ctypes.POINTER(ViChar), ViInt32, ctypes.POINTER(ViChar)]  # noqa: F405
+                self.niRFSG_GetTerminalName_cfunc.restype = ViStatus  # noqa: F405
+        return self.niRFSG_GetTerminalName_cfunc(vi, signal, signal_identifier, buffer_size, terminal_name)
+
     def niRFSG_GetWaveformBurstStartLocations(self, vi, channel_name, number_of_locations, locations, required_size):  # noqa: N802
         with self._func_lock:
             if self.niRFSG_GetWaveformBurstStartLocations_cfunc is None:
@@ -706,14 +715,6 @@ def niRFSG_ResetWithDefaults(self, vi):  # noqa: N802
                 self.niRFSG_ResetWithDefaults_cfunc.restype = ViStatus  # noqa: F405
         return self.niRFSG_ResetWithDefaults_cfunc(vi)
 
-    def niRFSG_ResetWithOptions(self, vi, steps_to_omit):  # noqa: N802
-        with self._func_lock:
-            if self.niRFSG_ResetWithOptions_cfunc is None:
-                self.niRFSG_ResetWithOptions_cfunc = self._get_library_function('niRFSG_ResetWithOptions')
-                self.niRFSG_ResetWithOptions_cfunc.argtypes = [ViSession, ViUInt64]  # noqa: F405
-                self.niRFSG_ResetWithOptions_cfunc.restype = ViStatus  # noqa: F405
-        return self.niRFSG_ResetWithOptions_cfunc(vi, steps_to_omit)
-
     def niRFSG_RevisionQuery(self, vi, instrument_driver_revision, firmware_revision):  # noqa: N802
         with self._func_lock:
             if self.niRFSG_RevisionQuery_cfunc is None:

generated/nirfsg/nirfsg/_library.py

@@ -567,6 +567,20 @@ def get_stream_endpoint_handle(self, stream_endpoint):  # noqa: N802
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return int(reader_handle_ctype.value)
 
+    def get_terminal_name(self, signal, signal_identifier):  # noqa: N802
+        vi_ctype = _visatype.ViSession(self._vi)  # case S110
+        signal_ctype = _visatype.ViInt32(signal.value)  # case S130
+        signal_identifier_ctype = ctypes.create_string_buffer(signal_identifier.encode(self._encoding))  # case C020
+        buffer_size_ctype = _visatype.ViInt32()  # case S170
+        terminal_name_ctype = None  # case C050
+        error_code = self._library.niRFSG_GetTerminalName(vi_ctype, signal_ctype, signal_identifier_ctype, buffer_size_ctype, terminal_name_ctype)
+        errors.handle_error(self, error_code, ignore_warnings=True, is_error_handling=False)
+        buffer_size_ctype = _visatype.ViInt32(error_code)  # case S180
+        terminal_name_ctype = (_visatype.ViChar * buffer_size_ctype.value)()  # case C060
+        error_code = self._library.niRFSG_GetTerminalName(vi_ctype, signal_ctype, signal_identifier_ctype, buffer_size_ctype, terminal_name_ctype)
+        errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
+        return terminal_name_ctype.value.decode(self._encoding)
+
     def get_waveform_burst_start_locations(self, channel_name, number_of_locations):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         channel_name_ctype = ctypes.create_string_buffer(channel_name.encode(self._encoding))  # case C010

generated/nirfsg/nirfsg/_library_interpreter.py

@@ -4341,7 +4341,7 @@ class _SessionBase(object):
 
                     PXIe-5840/5841: RF blanking does not occur for frequencies below 120MHz.
 
-                    For PXIe-5830/5831/5832: The RF Blanking reserves a PXI trigger line. If you are calling any reset or `niRFSA_reset <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_reset.html>`_ on the same device, NI recommends calling it before committing blanking properties. Alternatively, you can call reset_with_options or `niRFSA_ResetWithOptions <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_resetwithoptions.html>`_. Select **Routes** in the **steps to omit** parameter.
+                    For PXIe-5830/5831/5832: The RF Blanking reserves a PXI trigger line. If you are calling any reset or `niRFSA_reset <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_reset.html>`_ on the same device, NI recommends calling it before committing blanking properties. Alternatively, you can call ResetWithOptions or `niRFSA_ResetWithOptions <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_resetwithoptions.html>`_. Select **Routes** in the **steps to omit** parameter.
 
                     **Default Value:** "" (empty string)
 
@@ -5194,7 +5194,7 @@ class _SessionBase(object):
     | NIRFSG_VAL_MARKER0, NIRFSG_VAL_MARKER1, NIRFSG_VAL_MARKER2, or NIRFSG_VAL_MARKER3 | RFBlanking.ENABLE    | Error is shown.                                                                                           |
     +-----------------------------------------------------------------------------------+----------------------+-----------------------------------------------------------------------------------------------------------+
 
-    Note: For PXIe-5830/5831/5832: The RF Blanking reserves a PXI trigger line. If you are calling any reset or `niRFSA_reset <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_reset.html>`_ on the same device, NI recommends calling it before committing blanking properties. Alternatively, you can call reset_with_options or `niRFSA_ResetWithOptions <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_resetwithoptions.html>`_. Select **Routes** in the **steps to omit** parameter.
+    Note: For PXIe-5830/5831/5832: The RF Blanking reserves a PXI trigger line. If you are calling any reset or `niRFSA_reset <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_reset.html>`_ on the same device, NI recommends calling it before committing blanking properties. Alternatively, you can call ResetWithOptions or `niRFSA_ResetWithOptions <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_resetwithoptions.html>`_. Select **Routes** in the **steps to omit** parameter.
 
     Note:
     One or more of the referenced values are not in the Python API for this driver. Enums that only define values, or represent True/False, have been removed.
@@ -5285,7 +5285,7 @@ class _SessionBase(object):
 
     Note: - When you download a waveform using ReadAndDownloadWaveformFromFileTdms method and if waveform_rf_blanking property is enabled, you must set the write_waveform_burst_detection property to WriteWaveformBurstDetection.DISABLE.
 
-     - For PXIe-5830/5831/5832: The RF Blanking reserves a PXI trigger line. If you are calling any reset or `niRFSA_reset <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_reset.html>`_ on the same device, NI recommends calling it before committing blanking properties. Alternatively, you can call reset_with_options or `niRFSA_ResetWithOptions <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_resetwithoptions.html>`_. Select **Routes** in the **steps to omit** parameter.
+     - For PXIe-5830/5831/5832: The RF Blanking reserves a PXI trigger line. If you are calling any reset or `niRFSA_reset <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_reset.html>`_ on the same device, NI recommends calling it before committing blanking properties. Alternatively, you can call ResetWithOptions or `niRFSA_ResetWithOptions <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/cvinirfsa_resetwithoptions.html>`_. Select **Routes** in the **steps to omit** parameter.
 
     Note:
     One or more of the referenced values are not in the Python API for this driver. Enums that only define values, or represent True/False, have been removed.
@@ -7975,7 +7975,7 @@ def reset(self):
 
                         Generally, calling this method instead of the reset_device method is acceptable. The reset method executes faster than the reset_device method.
 
-                        To avoid resetting routes on the PXIe-5644/5645/5646 and PXIe-5820/5830/5831/5832/5840/5841/5842/5860 that are in use by NI-RFSA sessions, NI recommends using the reset_with_options method, with **stepsToOmit** set to ResetWithOptionsStepsToOmit.ROUTES .
+                        To avoid resetting routes on the PXIe-5644/5645/5646 and PXIe-5820/5830/5831/5832/5840/5841/5842/5860 that are in use by NI-RFSA sessions, NI recommends using the ResetWithOptions method, with **stepsToOmit** set to ResetWithOptionsStepsToOmit.ROUTES .
 
                         **Supported Devices** : PXI-5610, PXIe-5611, PXIe-5644/5645/5646, PXI/PXIe-5650/5651/5652, PXIe-5653/5654/5654 with PXIe-5696, PXI-5670/5671, PXIe-5672/5673/5673E, PXIe-5820/5830/5831/5832/5840/5841/5842/5860
 
@@ -8041,6 +8041,7 @@ def revision_query(self):
         instrument_driver_revision, firmware_revision = self._interpreter.revision_query()
         return instrument_driver_revision, firmware_revision
 
+    @ivi_synchronized
     def select_arb_waveform(self, name):
         r'''select_arb_waveform
 

generated/nirfsg/nirfsg/session.py

@@ -165,6 +165,9 @@ def __init__(self):
         self._defaults['GetStreamEndpointHandle'] = {}
         self._defaults['GetStreamEndpointHandle']['return'] = 0
         self._defaults['GetStreamEndpointHandle']['readerHandle'] = None
+        self._defaults['GetTerminalName'] = {}
+        self._defaults['GetTerminalName']['return'] = 0
+        self._defaults['GetTerminalName']['terminalName'] = None
         self._defaults['GetWaveformBurstStartLocations'] = {}
         self._defaults['GetWaveformBurstStartLocations']['return'] = 0
         self._defaults['GetWaveformBurstStartLocations']['locations'] = None
@@ -726,6 +729,17 @@ def niRFSG_GetStreamEndpointHandle(self, vi, stream_endpoint, reader_handle):  #
             reader_handle.contents.value = self._defaults['GetStreamEndpointHandle']['readerHandle']
         return self._defaults['GetStreamEndpointHandle']['return']
 
+    def niRFSG_GetTerminalName(self, vi, signal, signal_identifier, buffer_size, terminal_name):  # noqa: N802
+        if self._defaults['GetTerminalName']['return'] != 0:
+            return self._defaults['GetTerminalName']['return']
+        # terminal_name
+        if self._defaults['GetTerminalName']['terminalName'] is None:
+            raise MockFunctionCallError("niRFSG_GetTerminalName", param='terminalName')
+        if buffer_size.value == 0:
+            return len(self._defaults['GetTerminalName']['terminalName'])
+        terminal_name.value = self._defaults['GetTerminalName']['terminalName'].encode('ascii')
+        return self._defaults['GetTerminalName']['return']
+
     def niRFSG_GetWaveformBurstStartLocations(self, vi, channel_name, number_of_locations, locations, required_size):  # noqa: N802
         if self._defaults['GetWaveformBurstStartLocations']['return'] != 0:
             return self._defaults['GetWaveformBurstStartLocations']['return']
@@ -1135,6 +1149,8 @@ def set_side_effects_and_return_values(self, mock_library):
         mock_library.niRFSG_GetSelfCalibrationTemperature.return_value = 0
         mock_library.niRFSG_GetStreamEndpointHandle.side_effect = MockFunctionCallError("niRFSG_GetStreamEndpointHandle")
         mock_library.niRFSG_GetStreamEndpointHandle.return_value = 0
+        mock_library.niRFSG_GetTerminalName.side_effect = MockFunctionCallError("niRFSG_GetTerminalName")
+        mock_library.niRFSG_GetTerminalName.return_value = 0
         mock_library.niRFSG_GetWaveformBurstStartLocations.side_effect = MockFunctionCallError("niRFSG_GetWaveformBurstStartLocations")
         mock_library.niRFSG_GetWaveformBurstStartLocations.return_value = 0
         mock_library.niRFSG_GetWaveformBurstStopLocations.side_effect = MockFunctionCallError("niRFSG_GetWaveformBurstStopLocations")

generated/nirfsg/nirfsg/unit_tests/_mock_helper.py

@@ -4134,78 +4134,6 @@
         ],
         'returns': 'ViStatus'
     },
-    'ResetWithOptions': {
-        'codegen_method': 'public',
-        'documentation': {
-            'description': '              \n                Resets all properties to default values and specifies steps to omit during the reset process, such as signal routes.\n\n                By default, this function exhibits the same behavior as nirfsg_Reset. You can specify steps to omit using the steps to omit parameter. For example, if you specify NIRFSG_VAL_RESET_WITH_OPTIONS_ROUTES for the NIRFSG_ATTR_STEPS_TO_OMIT parameter, this function does not release signal routes during the reset process.\n\n                When routes of signals between two devices are released, they are released regardless of which device created the route.\n\n                To avoid resetting routes on PXIe-5820/5830/5831/5832/5840/5841/5842/5860 that are in use by NI-RFSA sessions, NI recommends using this function instead of nirfsg_Reset, with NIRFSG_ATTR_STEPS_TO_OMIT set to NIRFSG_VAL_RESET_WITH_OPTIONS_ROUTES.\n\n                **Supported Devices** : PXIe-5644/5645/5646, PXIe-5820/5830/5831/5832/5840/5841/5842/5860\n\n                **Related Topics**\n\n                `Triggers <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/triggers.html>`_\n\n                `Events <https://www.ni.com/docs/en-US/bundle/rfsg/page/rfsg/events.html>`_\n                '
-        },
-        'included_in_proto': True,
-        'method_templates': [
-            {
-                'documentation_filename': 'default_method',
-                'library_interpreter_filename': 'default_method',
-                'method_python_name_suffix': '',
-                'session_filename': 'default_method'
-            }
-        ],
-        'parameters': [
-            {
-                'direction': 'in',
-                'documentation': {
-                    'description': 'Identifies your instrument session. The ViSession handle is obtained from the nirfsg_Init function or the nirfsg_InitWithOptions function and identifies a particular instrument session.'
-                },
-                'name': 'vi',
-                'type': 'ViSession',
-                'use_array': False,
-                'use_in_python_api': True
-            },
-            {
-                'direction': 'in',
-                'documentation': {
-                    'description': 'Specifies a list of steps to skip during the reset process. The default value is NIRFSG_VAL_RESET_WITH_OPTIONS_NONE, which specifies that no step is omitted during reset. **Defined Values** :',
-                    'note': 'NIRFSG_VAL_RESET_WITH_OPTIONS_ROUTES is not supported in external calibration or alignment sessions.',
-                    'table_body': [
-                        [
-                            'NIRFSG_VAL_RESET_WITH_OPTIONS_NONE',
-                            '0 (0x0)',
-                            'No step is omitted during reset.'
-                        ],
-                        [
-                            'NIRFSG_VAL_RESET_WITH_OPTIONS_WAVEFORMS',
-                            '1 (0x1)',
-                            'Omits clearing waveforms.'
-                        ],
-                        [
-                            'NIRFSG_VAL_RESET_WITH_OPTIONS_SCRIPTS',
-                            '2 (0x2)',
-                            'Omits clearing scripts.'
-                        ],
-                        [
-                            'NIRFSG_VAL_RESET_WITH_OPTIONS_ROUTES',
-                            '4 (0x4)',
-                            'Omits the routing reset step. Routing is preserved after a reset. However, routing related properties are reset to default, and routing is released if the default properties are committed after a reset.'
-                        ],
-                        [
-                            'NIRFSG_VAL_RESET_WITH_OPTIONS_DEEMBEDDING_TABLES',
-                            '8 (0x8)',
-                            'Omits deleting de-embedding tables. This step is valid only for the PXIe-5830/5831/5832/5840.'
-                        ]
-                    ],
-                    'table_header': [
-                        'Name',
-                        'Value',
-                        'Description'
-                    ]
-                },
-                'enum': 'ResetWithOptionsStepsToOmit',
-                'name': 'stepsToOmit',
-                'type': 'ViUInt64',
-                'use_array': False,
-                'use_in_python_api': True
-            }
-        ],
-        'returns': 'ViStatus'
-    },
     'RevisionQuery': {
         'codegen_method': 'public',
         'documentation': {