NI-RFSG metadata from codegenerated files with some cleanup and dev status override logic (#2124)

* codegenerated metadata and dev status override logic

* getsparameter cleanup

* fixes based on review comments

---------

Co-authored-by: vnktshr21 <[email protected]>

Author: vnktshr21

build/helper/helper.py

@@ -117,21 +117,24 @@ def get_development_status(config):
        .bN, cN, rcN - Beta
        <nothing> or postN - Stable
     '''
-    v = Version(config['module_version'])
-    if v.release[0] == 0 and v.release[1] < 5:
-        dev_status = '3 - Alpha'
-    elif v.release[0] == 0:
-        dev_status = '4 - Beta'
+    if 'development_status' in config:
+        dev_status = config['development_status']
     else:
-        if v.dev is not None or (v.pre is not None and v.pre[0] == 'a'):
-            # .devN or .aN
+        v = Version(config['module_version'])
+        if v.release[0] == 0 and v.release[1] < 5:
             dev_status = '3 - Alpha'
-        elif v.pre is not None:
-            # .bN, .cN, .rcN
+        elif v.release[0] == 0:
             dev_status = '4 - Beta'
         else:
-            # <nothing> or .postN
-            dev_status = '5 - Production/Stable'
+            if v.dev is not None or (v.pre is not None and v.pre[0] == 'a'):
+                # .devN or .aN
+                dev_status = '3 - Alpha'
+            elif v.pre is not None:
+                # .bN, .cN, .rcN
+                dev_status = '4 - Beta'
+            else:
+                # <nothing> or .postN
+                dev_status = '5 - Production/Stable'
 
     return dev_status
 

docs/nirfsg/class.rst

@@ -651,12 +651,12 @@ IQOutPortTerminalConfiguration
 
 
 
-LoOutExportConfigureFromRFSaEnable
+LoOutExportConfigureFromRfsaEnable
 ----------------------------------
 
-.. py:class:: LoOutExportConfigureFromRFSaEnable
+.. py:class:: LoOutExportConfigureFromRfsaEnable
 
-    .. py:attribute:: LoOutExportConfigureFromRFSaEnable.DISABLE
+    .. py:attribute:: LoOutExportConfigureFromRfsaEnable.DISABLE
 
 
 
@@ -666,7 +666,7 @@ LoOutExportConfigureFromRFSaEnable
 
 
 
-    .. py:attribute:: LoOutExportConfigureFromRFSaEnable.ENABLE
+    .. py:attribute:: LoOutExportConfigureFromRfsaEnable.ENABLE
 
 
 
@@ -676,12 +676,12 @@ LoOutExportConfigureFromRFSaEnable
 
 
 
-LoPlLfractionalModeEnabled
+LoPllFractionalModeEnabled
 --------------------------
 
-.. py:class:: LoPlLfractionalModeEnabled
+.. py:class:: LoPllFractionalModeEnabled
 
-    .. py:attribute:: LoPlLfractionalModeEnabled.DISABLE
+    .. py:attribute:: LoPllFractionalModeEnabled.DISABLE
 
 
 
@@ -691,7 +691,7 @@ LoPlLfractionalModeEnabled
 
 
 
-    .. py:attribute:: LoPlLfractionalModeEnabled.ENABLE
+    .. py:attribute:: LoPllFractionalModeEnabled.ENABLE
 
 
 

docs/nirfsg/enums.rst

@@ -499,13 +499,13 @@ def niRFSG_GetChannelName(self, vi, index, buffer_size, name):  # noqa: N802
                 self.niRFSG_GetChannelName_cfunc.restype = ViStatus  # noqa: F405
         return self.niRFSG_GetChannelName_cfunc(vi, index, buffer_size, name)
 
-    def niRFSG_GetDeembeddingSparameters(self, vi, sparameters, sparameter_array_size, number_of_sparameters, number_of_ports):  # noqa: N802
+    def niRFSG_GetDeembeddingSparameters(self, vi, sparameters, sparameters_array_size, number_of_sparameters, number_of_ports):  # noqa: N802
         with self._func_lock:
             if self.niRFSG_GetDeembeddingSparameters_cfunc is None:
                 self.niRFSG_GetDeembeddingSparameters_cfunc = self._get_library_function('niRFSG_GetDeembeddingSparameters')
                 self.niRFSG_GetDeembeddingSparameters_cfunc.argtypes = [ViSession, ctypes.POINTER(NIComplexNumber), ViInt32, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt32)]  # noqa: F405
                 self.niRFSG_GetDeembeddingSparameters_cfunc.restype = ViStatus  # noqa: F405
-        return self.niRFSG_GetDeembeddingSparameters_cfunc(vi, sparameters, sparameter_array_size, number_of_sparameters, number_of_ports)
+        return self.niRFSG_GetDeembeddingSparameters_cfunc(vi, sparameters, sparameters_array_size, number_of_sparameters, number_of_ports)
 
     def niRFSG_GetDeembeddingTableNumberOfPorts(self, vi, number_of_ports):  # noqa: N802
         with self._func_lock:

generated/nirfsg/nirfsg/_library.py

@@ -264,7 +264,7 @@ def configure_digital_edge_start_trigger(self, source, edge):  # noqa: N802
 
     def configure_digital_level_script_trigger(self, trigger_id, source, level):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
-        trigger_id_ctype = ctypes.create_string_buffer(trigger_id.encode(self._encoding))  # case C020
+        trigger_id_ctype = ctypes.create_string_buffer(trigger_id.encode(self._encoding))  # case C010
         source_ctype = ctypes.create_string_buffer(source.encode(self._encoding))  # case C020
         level_ctype = _visatype.ViInt32(level)  # case S150
         error_code = self._library.niRFSG_ConfigureDigitalLevelScriptTrigger(vi_ctype, trigger_id_ctype, source_ctype, level_ctype)
@@ -486,15 +486,15 @@ def get_channel_name(self, index):  # noqa: N802
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return name_ctype.value.decode(self._encoding)
 
-    def get_deembedding_sparameters(self, sparameters, sparameter_array_size):  # noqa: N802
+    def get_deembedding_sparameters(self, sparameters, sparameters_array_size):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         sparameters_ctype = _get_ctypes_pointer_for_buffer(value=sparameters, library_type=_complextype.NIComplexNumber)  # case B510
-        sparameter_array_size_ctype = _visatype.ViInt32(sparameter_array_size)  # case S150
+        sparameters_array_size_ctype = _visatype.ViInt32(sparameters_array_size)  # case S150
         number_of_sparameters_ctype = _visatype.ViInt32()  # case S220
         number_of_ports_ctype = _visatype.ViInt32()  # case S220
-        error_code = self._library.niRFSG_GetDeembeddingSparameters(vi_ctype, sparameters_ctype, sparameter_array_size_ctype, None if number_of_sparameters_ctype is None else (ctypes.pointer(number_of_sparameters_ctype)), None if number_of_ports_ctype is None else (ctypes.pointer(number_of_ports_ctype)))
+        error_code = self._library.niRFSG_GetDeembeddingSparameters(vi_ctype, sparameters_ctype, sparameters_array_size_ctype, None if number_of_sparameters_ctype is None else (ctypes.pointer(number_of_sparameters_ctype)), None if number_of_ports_ctype is None else (ctypes.pointer(number_of_ports_ctype)))
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
-        return int(number_of_ports_ctype.value)
+        return int(number_of_sparameters_ctype.value), int(number_of_ports_ctype.value)
 
     def get_deembedding_table_number_of_ports(self):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110

generated/nirfsg/nirfsg/_library_interpreter.py

@@ -284,7 +284,7 @@ class IQOutPortTerminalConfiguration(Enum):
     '''
 
 
-class LoOutExportConfigureFromRFSaEnable(Enum):
+class LoOutExportConfigureFromRfsaEnable(Enum):
     DISABLE = 0
     r'''
     Do not allow NI-RFSA to control the NI-RFSG local oscillator export.
@@ -295,7 +295,7 @@ class LoOutExportConfigureFromRFSaEnable(Enum):
     '''
 
 
-class LoPlLfractionalModeEnabled(Enum):
+class LoPllFractionalModeEnabled(Enum):
     DISABLE = 0
     r'''
     Disables fractional mode for the LO PLL.