VNA and SpecAn API changes (#1140)

Co-authored-by: rnagaraj <rahul.nagaraju@ni.com>

README.md

@@ -24,7 +24,7 @@ Indicates the most recent driver version used to test builds of the current sour
 | NI-RFmx LTE               | 2024 Q4       | Not Supported | Not Supported |
 | NI-RFmx Pulse             | 2025 Q1       | Not Supported | Not Supported |
 | NI-RFmx NR                | 2024 Q4       | Not Supported | Not Supported |
-| NI-RFmx SpecAn            | 2024 Q3       | Not Supported | Not Supported |
+| NI-RFmx SpecAn            | 2024 Q4       | Not Supported | Not Supported |
 | NI-RFmx TD-SCDMA          | 2023 Q1       | Not Supported | Not Supported |
 | NI-RFmx VNA               | 2024 Q4       | Not Supported | Not Supported |
 | NI-RFmx WCDMA             | 2023 Q1       | Not Supported | Not Supported |

generated/nirfmxspecan/nirfmxspecan.proto

@@ -1,6 +1,6 @@
 
 //---------------------------------------------------------------------
-// This file is generated from NI-RFMXSPECAN API metadata version 24.8.0
+// This file is generated from NI-RFMXSPECAN API metadata version 25.0.0
 //---------------------------------------------------------------------
 // Proto file for the NI-RFMXSPECAN Metadata
 //---------------------------------------------------------------------
@@ -930,6 +930,7 @@ enum NiRFmxSpecAnAttribute {
   NIRFMXSPECAN_ATTRIBUTE_AMPM_RESULTS_COMPRESSION_POINT_GAIN_REFERENCE = 1105975;
   NIRFMXSPECAN_ATTRIBUTE_AMPM_RESULTS_PEAK_REFERENCE_POWER = 1105976;
   NIRFMXSPECAN_ATTRIBUTE_AMPM_RESULTS_PEAK_REFERENCE_POWER_GAIN = 1105977;
+  NIRFMXSPECAN_ATTRIBUTE_AMPM_THRESHOLD_DEFINITION = 1105980;
   NIRFMXSPECAN_ATTRIBUTE_DPD_MEASUREMENT_ENABLED = 1110016;
   NIRFMXSPECAN_ATTRIBUTE_DPD_MEASUREMENT_SAMPLE_RATE_MODE = 1110018;
   NIRFMXSPECAN_ATTRIBUTE_DPD_MEASUREMENT_SAMPLE_RATE = 1110019;
@@ -1013,6 +1014,7 @@ enum NiRFmxSpecAnAttribute {
   NIRFMXSPECAN_ATTRIBUTE_DPD_DVR_NUMBER_OF_SEGMENTS = 1110119;
   NIRFMXSPECAN_ATTRIBUTE_DPD_DVR_NONLINEAR_MEMORY_DEPTH = 1110121;
   NIRFMXSPECAN_ATTRIBUTE_DPD_MEASUREMENT_MODE = 1110123;
+  NIRFMXSPECAN_ATTRIBUTE_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION = 1110125;
   NIRFMXSPECAN_ATTRIBUTE_IQ_MEASUREMENT_ENABLED = 1110272;
   NIRFMXSPECAN_ATTRIBUTE_IQ_SAMPLE_RATE = 1110274;
   NIRFMXSPECAN_ATTRIBUTE_IQ_NUMBER_OF_RECORDS = 1110275;
@@ -2332,6 +2334,8 @@ enum NiRFmxSpecAnInt32AttributeValues {
   NIRFMXSPECAN_INT32_AMPM_SIGNAL_TYPE_TONES = 1;
   NIRFMXSPECAN_INT32_AMPM_SYNCHRONIZATION_METHOD_DIRECT = 1;
   NIRFMXSPECAN_INT32_AMPM_SYNCHRONIZATION_METHOD_ALIAS_PROTECTED = 2;
+  NIRFMXSPECAN_INT32_AMPM_THRESHOLD_DEFINITION_INPUT_AND_OUTPUT = 0;
+  NIRFMXSPECAN_INT32_AMPM_THRESHOLD_DEFINITION_REFERENCE_POWER_TYPE = 1;
   NIRFMXSPECAN_INT32_AMPM_THRESHOLD_ENABLED_FALSE = 0;
   NIRFMXSPECAN_INT32_AMPM_THRESHOLD_ENABLED_TRUE = 1;
   NIRFMXSPECAN_INT32_AMPM_THRESHOLD_TYPE_RELATIVE = 0;
@@ -2435,6 +2439,8 @@ enum NiRFmxSpecAnInt32AttributeValues {
   NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_AM_TO_PM_CURVE_FIT_TYPE_LEAST_SQUARE = 0;
   NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_AM_TO_PM_CURVE_FIT_TYPE_LEAST_ABSOLUTE_RESIDUAL = 1;
   NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_AM_TO_PM_CURVE_FIT_TYPE_BISQUARE = 2;
+  NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION_INPUT_AND_OUTPUT = 0;
+  NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION_INPUT = 1;
   NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_THRESHOLD_ENABLED_FALSE = 0;
   NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_THRESHOLD_ENABLED_TRUE = 1;
   NIRFMXSPECAN_INT32_DPD_LOOKUP_TABLE_THRESHOLD_TYPE_RELATIVE = 0;

generated/nirfmxvna/nirfmxvna.proto

@@ -1877,7 +1877,7 @@ message CopyCalsetResponse {
 message CopyDataToMeasurementMemoryRequest {
   nidevice_grpc.Session instrument = 1;
   string selector_string = 2;
-  string memory_data_name = 3;
+  string measurement_memory_name = 3;
 }
 
 message CopyDataToMeasurementMemoryResponse {
@@ -2290,7 +2290,7 @@ message LoadDataToMeasurementMemoryFromFileRequest {
   string selector_string = 2;
   string file_path = 3;
   string parameter = 4;
-  string memory_data_name = 5;
+  string measurement_memory_name = 5;
 }
 
 message LoadDataToMeasurementMemoryFromFileResponse {

generated/nirfmxvna/nirfmxvna_client.cpp

@@ -2310,14 +2310,14 @@ copy_calset(const StubPtr& stub, const nidevice_grpc::Session& instrument, const
 }
 
 CopyDataToMeasurementMemoryResponse
-copy_data_to_measurement_memory(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& memory_data_name)
+copy_data_to_measurement_memory(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& measurement_memory_name)
 {
   ::grpc::ClientContext context;
 
   auto request = CopyDataToMeasurementMemoryRequest{};
   request.mutable_instrument()->CopyFrom(instrument);
   request.set_selector_string(selector_string);
-  request.set_memory_data_name(memory_data_name);
+  request.set_measurement_memory_name(measurement_memory_name);
 
   auto response = CopyDataToMeasurementMemoryResponse{};
 
@@ -2982,7 +2982,7 @@ initiate(const StubPtr& stub, const nidevice_grpc::Session& instrument, const st
 }
 
 LoadDataToMeasurementMemoryFromFileResponse
-load_data_to_measurement_memory_from_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& file_path, const std::string& parameter, const std::string& memory_data_name)
+load_data_to_measurement_memory_from_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& file_path, const std::string& parameter, const std::string& measurement_memory_name)
 {
   ::grpc::ClientContext context;
 
@@ -2991,7 +2991,7 @@ load_data_to_measurement_memory_from_file(const StubPtr& stub, const nidevice_gr
   request.set_selector_string(selector_string);
   request.set_file_path(file_path);
   request.set_parameter(parameter);
-  request.set_memory_data_name(memory_data_name);
+  request.set_measurement_memory_name(measurement_memory_name);
 
   auto response = LoadDataToMeasurementMemoryFromFileResponse{};
 

generated/nirfmxvna/nirfmxvna_client.h

@@ -140,7 +140,7 @@ CloneSignalConfigurationResponse clone_signal_configuration(const StubPtr& stub,
 CloseResponse close(const StubPtr& stub, const nidevice_grpc::Session& instrument, const bool& force_destroy);
 CommitResponse commit(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string);
 CopyCalsetResponse copy_calset(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& source_calset_name, const std::string& new_calset_name);
-CopyDataToMeasurementMemoryResponse copy_data_to_measurement_memory(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& memory_data_name);
+CopyDataToMeasurementMemoryResponse copy_data_to_measurement_memory(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& measurement_memory_name);
 CreateSignalConfigurationResponse create_signal_configuration(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& signal_name);
 DeleteSignalConfigurationResponse delete_signal_configuration(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& signal_name);
 DeselectActiveCalsetResponse deselect_active_calset(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string);
@@ -176,7 +176,7 @@ IQFetchDataSplitResponse iq_fetch_data_split(const StubPtr& stub, const nidevice
 InitializeResponse initialize(const StubPtr& stub, const std::string& resource_name, const std::string& option_string, const nidevice_grpc::SessionInitializationBehavior& initialization_behavior = nidevice_grpc::SESSION_INITIALIZATION_BEHAVIOR_UNSPECIFIED);
 InitializeFromNIRFSASessionResponse initialize_from_nirfsa_session(const StubPtr& stub, const nidevice_grpc::Session& nirfsa_session, const nidevice_grpc::SessionInitializationBehavior& initialization_behavior = nidevice_grpc::SESSION_INITIALIZATION_BEHAVIOR_UNSPECIFIED);
 InitiateResponse initiate(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name);
-LoadDataToMeasurementMemoryFromFileResponse load_data_to_measurement_memory_from_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& file_path, const std::string& parameter, const std::string& memory_data_name);
+LoadDataToMeasurementMemoryFromFileResponse load_data_to_measurement_memory_from_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& file_path, const std::string& parameter, const std::string& measurement_memory_name);
 MarkerCfgDataSourceResponse marker_cfg_data_source(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& data_source);
 MarkerCfgModeResponse marker_cfg_mode(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<MarkerMode, pb::int32>& marker_mode);
 MarkerCfgNumberOfMarkersResponse marker_cfg_number_of_markers(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& number_of_markers);

generated/nirfmxvna/nirfmxvna_compilation_test.cpp

@@ -597,9 +597,9 @@ int32 CopyCalset(niRFmxInstrHandle instrumentHandle, char selectorString[], char
   return RFmxVNA_CopyCalset(instrumentHandle, selectorString, sourceCalsetName, newCalsetName);
 }
 
-int32 CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char memoryDataName[])
+int32 CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char measurementMemoryName[])
 {
-  return RFmxVNA_CopyDataToMeasurementMemory(instrumentHandle, selectorString, memoryDataName);
+  return RFmxVNA_CopyDataToMeasurementMemory(instrumentHandle, selectorString, measurementMemoryName);
 }
 
 int32 CreateSignalConfiguration(niRFmxInstrHandle instrumentHandle, char signalName[])
@@ -777,9 +777,9 @@ int32 Initiate(niRFmxInstrHandle instrumentHandle, char selectorString[], char r
   return RFmxVNA_Initiate(instrumentHandle, selectorString, resultName);
 }
 
-int32 LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char memoryDataName[])
+int32 LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char measurementMemoryName[])
 {
-  return RFmxVNA_LoadDataToMeasurementMemoryFromFile(instrumentHandle, selectorString, filePath, parameter, memoryDataName);
+  return RFmxVNA_LoadDataToMeasurementMemoryFromFile(instrumentHandle, selectorString, filePath, parameter, measurementMemoryName);
 }
 
 int32 MarkerCfgDataSource(niRFmxInstrHandle instrumentHandle, char selectorString[], char dataSource[])

generated/nirfmxvna/nirfmxvna_library.cpp

@@ -1188,12 +1188,12 @@ int32 NiRFmxVNALibrary::CopyCalset(niRFmxInstrHandle instrumentHandle, char sele
   return function_pointers_.CopyCalset(instrumentHandle, selectorString, sourceCalsetName, newCalsetName);
 }
 
-int32 NiRFmxVNALibrary::CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char memoryDataName[])
+int32 NiRFmxVNALibrary::CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char measurementMemoryName[])
 {
   if (!function_pointers_.CopyDataToMeasurementMemory) {
     throw nidevice_grpc::LibraryLoadException("Could not find RFmxVNA_CopyDataToMeasurementMemory.");
   }
-  return function_pointers_.CopyDataToMeasurementMemory(instrumentHandle, selectorString, memoryDataName);
+  return function_pointers_.CopyDataToMeasurementMemory(instrumentHandle, selectorString, measurementMemoryName);
 }
 
 int32 NiRFmxVNALibrary::CreateSignalConfiguration(niRFmxInstrHandle instrumentHandle, char signalName[])
@@ -1476,12 +1476,12 @@ int32 NiRFmxVNALibrary::Initiate(niRFmxInstrHandle instrumentHandle, char select
   return function_pointers_.Initiate(instrumentHandle, selectorString, resultName);
 }
 
-int32 NiRFmxVNALibrary::LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char memoryDataName[])
+int32 NiRFmxVNALibrary::LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char measurementMemoryName[])
 {
   if (!function_pointers_.LoadDataToMeasurementMemoryFromFile) {
     throw nidevice_grpc::LibraryLoadException("Could not find RFmxVNA_LoadDataToMeasurementMemoryFromFile.");
   }
-  return function_pointers_.LoadDataToMeasurementMemoryFromFile(instrumentHandle, selectorString, filePath, parameter, memoryDataName);
+  return function_pointers_.LoadDataToMeasurementMemoryFromFile(instrumentHandle, selectorString, filePath, parameter, measurementMemoryName);
 }
 
 int32 NiRFmxVNALibrary::MarkerCfgDataSource(niRFmxInstrHandle instrumentHandle, char selectorString[], char dataSource[])

generated/nirfmxvna/nirfmxvna_library.h

@@ -139,7 +139,7 @@ class NiRFmxVNALibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
   int32 Close(niRFmxInstrHandle instrumentHandle, int32 forceDestroy) override;
   int32 Commit(niRFmxInstrHandle instrumentHandle, char selectorString[]) override;
   int32 CopyCalset(niRFmxInstrHandle instrumentHandle, char selectorString[], char sourceCalsetName[], char newCalsetName[]) override;
-  int32 CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char memoryDataName[]) override;
+  int32 CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char measurementMemoryName[]) override;
   int32 CreateSignalConfiguration(niRFmxInstrHandle instrumentHandle, char signalName[]) override;
   int32 DeleteSignalConfiguration(niRFmxInstrHandle instrumentHandle, char signalName[]) override;
   int32 DeselectActiveCalset(niRFmxInstrHandle instrumentHandle, char selectorString[]) override;
@@ -175,7 +175,7 @@ class NiRFmxVNALibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
   int32 Initialize(char resourceName[], char optionString[], niRFmxInstrHandle* handleOut, int32* isNewSession) override;
   int32 InitializeFromNIRFSASession(uInt32 nirfsaSession, niRFmxInstrHandle* handleOut) override;
   int32 Initiate(niRFmxInstrHandle instrumentHandle, char selectorString[], char resultName[]) override;
-  int32 LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char memoryDataName[]) override;
+  int32 LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char measurementMemoryName[]) override;
   int32 MarkerCfgDataSource(niRFmxInstrHandle instrumentHandle, char selectorString[], char dataSource[]) override;
   int32 MarkerCfgMode(niRFmxInstrHandle instrumentHandle, char selectorString[], int32 markerMode) override;
   int32 MarkerCfgNumberOfMarkers(niRFmxInstrHandle instrumentHandle, char selectorString[], int32 numberOfMarkers) override;

generated/nirfmxvna/nirfmxvna_library_interface.h

@@ -133,7 +133,7 @@ class NiRFmxVNALibraryInterface {
   virtual int32 Close(niRFmxInstrHandle instrumentHandle, int32 forceDestroy) = 0;
   virtual int32 Commit(niRFmxInstrHandle instrumentHandle, char selectorString[]) = 0;
   virtual int32 CopyCalset(niRFmxInstrHandle instrumentHandle, char selectorString[], char sourceCalsetName[], char newCalsetName[]) = 0;
-  virtual int32 CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char memoryDataName[]) = 0;
+  virtual int32 CopyDataToMeasurementMemory(niRFmxInstrHandle instrumentHandle, char selectorString[], char measurementMemoryName[]) = 0;
   virtual int32 CreateSignalConfiguration(niRFmxInstrHandle instrumentHandle, char signalName[]) = 0;
   virtual int32 DeleteSignalConfiguration(niRFmxInstrHandle instrumentHandle, char signalName[]) = 0;
   virtual int32 DeselectActiveCalset(niRFmxInstrHandle instrumentHandle, char selectorString[]) = 0;
@@ -169,7 +169,7 @@ class NiRFmxVNALibraryInterface {
   virtual int32 Initialize(char resourceName[], char optionString[], niRFmxInstrHandle* handleOut, int32* isNewSession) = 0;
   virtual int32 InitializeFromNIRFSASession(uInt32 nirfsaSession, niRFmxInstrHandle* handleOut) = 0;
   virtual int32 Initiate(niRFmxInstrHandle instrumentHandle, char selectorString[], char resultName[]) = 0;
-  virtual int32 LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char memoryDataName[]) = 0;
+  virtual int32 LoadDataToMeasurementMemoryFromFile(niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char measurementMemoryName[]) = 0;
   virtual int32 MarkerCfgDataSource(niRFmxInstrHandle instrumentHandle, char selectorString[], char dataSource[]) = 0;
   virtual int32 MarkerCfgMode(niRFmxInstrHandle instrumentHandle, char selectorString[], int32 markerMode) = 0;
   virtual int32 MarkerCfgNumberOfMarkers(niRFmxInstrHandle instrumentHandle, char selectorString[], int32 numberOfMarkers) = 0;

generated/nirfmxvna/nirfmxvna_mock_library.h

@@ -135,7 +135,7 @@ class NiRFmxVNAMockLibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
   MOCK_METHOD(int32, Close, (niRFmxInstrHandle instrumentHandle, int32 forceDestroy), (override));
   MOCK_METHOD(int32, Commit, (niRFmxInstrHandle instrumentHandle, char selectorString[]), (override));
   MOCK_METHOD(int32, CopyCalset, (niRFmxInstrHandle instrumentHandle, char selectorString[], char sourceCalsetName[], char newCalsetName[]), (override));
-  MOCK_METHOD(int32, CopyDataToMeasurementMemory, (niRFmxInstrHandle instrumentHandle, char selectorString[], char memoryDataName[]), (override));
+  MOCK_METHOD(int32, CopyDataToMeasurementMemory, (niRFmxInstrHandle instrumentHandle, char selectorString[], char measurementMemoryName[]), (override));
   MOCK_METHOD(int32, CreateSignalConfiguration, (niRFmxInstrHandle instrumentHandle, char signalName[]), (override));
   MOCK_METHOD(int32, DeleteSignalConfiguration, (niRFmxInstrHandle instrumentHandle, char signalName[]), (override));
   MOCK_METHOD(int32, DeselectActiveCalset, (niRFmxInstrHandle instrumentHandle, char selectorString[]), (override));
@@ -171,7 +171,7 @@ class NiRFmxVNAMockLibrary : public nirfmxvna_grpc::NiRFmxVNALibraryInterface {
   MOCK_METHOD(int32, Initialize, (char resourceName[], char optionString[], niRFmxInstrHandle* handleOut, int32* isNewSession), (override));
   MOCK_METHOD(int32, InitializeFromNIRFSASession, (uInt32 nirfsaSession, niRFmxInstrHandle* handleOut), (override));
   MOCK_METHOD(int32, Initiate, (niRFmxInstrHandle instrumentHandle, char selectorString[], char resultName[]), (override));
-  MOCK_METHOD(int32, LoadDataToMeasurementMemoryFromFile, (niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char memoryDataName[]), (override));
+  MOCK_METHOD(int32, LoadDataToMeasurementMemoryFromFile, (niRFmxInstrHandle instrumentHandle, char selectorString[], char filePath[], char parameter[], char measurementMemoryName[]), (override));
   MOCK_METHOD(int32, MarkerCfgDataSource, (niRFmxInstrHandle instrumentHandle, char selectorString[], char dataSource[]), (override));
   MOCK_METHOD(int32, MarkerCfgMode, (niRFmxInstrHandle instrumentHandle, char selectorString[], int32 markerMode), (override));
   MOCK_METHOD(int32, MarkerCfgNumberOfMarkers, (niRFmxInstrHandle instrumentHandle, char selectorString[], int32 numberOfMarkers), (override));