From 44ac8583508910ea52cad2916a36ac8e5b24fad3 Mon Sep 17 00:00:00 2001 From: rnagaraj Date: Thu, 12 Dec 2024 12:40:16 +0530 Subject: [PATCH] VNA and SpecAn API changes --- README.md | 2 +- generated/nirfmxspecan/nirfmxspecan.proto | 8 ++++- generated/nirfmxvna/nirfmxvna.proto | 4 +-- generated/nirfmxvna/nirfmxvna_client.cpp | 8 ++--- generated/nirfmxvna/nirfmxvna_client.h | 4 +-- .../nirfmxvna/nirfmxvna_compilation_test.cpp | 8 ++--- generated/nirfmxvna/nirfmxvna_library.cpp | 8 ++--- generated/nirfmxvna/nirfmxvna_library.h | 4 +-- .../nirfmxvna/nirfmxvna_library_interface.h | 4 +-- generated/nirfmxvna/nirfmxvna_mock_library.h | 4 +-- generated/nirfmxvna/nirfmxvna_service.cpp | 12 +++---- imports/include/niRFmxSpecAn.h | 34 +++++++++++++++++++ imports/include/niRFmxVNA.h | 11 ++++-- .../metadata/nirfmxspecan/attributes.py | 12 +++++++ .../codegen/metadata/nirfmxspecan/config.py | 2 +- source/codegen/metadata/nirfmxspecan/enums.py | 24 +++++++++++++ .../codegen/metadata/nirfmxvna/functions.py | 4 +-- 17 files changed, 118 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index e128daff2..069fe1e04 100644 --- a/README.md +++ b/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 | diff --git a/generated/nirfmxspecan/nirfmxspecan.proto b/generated/nirfmxspecan/nirfmxspecan.proto index d876b1233..5ba75642c 100644 --- a/generated/nirfmxspecan/nirfmxspecan.proto +++ b/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; diff --git a/generated/nirfmxvna/nirfmxvna.proto b/generated/nirfmxvna/nirfmxvna.proto index 827521284..42e5f2851 100644 --- a/generated/nirfmxvna/nirfmxvna.proto +++ b/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 { diff --git a/generated/nirfmxvna/nirfmxvna_client.cpp b/generated/nirfmxvna/nirfmxvna_client.cpp index 23c13320d..8ecac7eda 100644 --- a/generated/nirfmxvna/nirfmxvna_client.cpp +++ b/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{}; diff --git a/generated/nirfmxvna/nirfmxvna_client.h b/generated/nirfmxvna/nirfmxvna_client.h index fe7015789..8cac3d233 100644 --- a/generated/nirfmxvna/nirfmxvna_client.h +++ b/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& 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); diff --git a/generated/nirfmxvna/nirfmxvna_compilation_test.cpp b/generated/nirfmxvna/nirfmxvna_compilation_test.cpp index b391b84ab..072f3b489 100644 --- a/generated/nirfmxvna/nirfmxvna_compilation_test.cpp +++ b/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[]) diff --git a/generated/nirfmxvna/nirfmxvna_library.cpp b/generated/nirfmxvna/nirfmxvna_library.cpp index 7da706b46..e3d3526b3 100644 --- a/generated/nirfmxvna/nirfmxvna_library.cpp +++ b/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[]) diff --git a/generated/nirfmxvna/nirfmxvna_library.h b/generated/nirfmxvna/nirfmxvna_library.h index 67aa71a79..26b74aa17 100644 --- a/generated/nirfmxvna/nirfmxvna_library.h +++ b/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; diff --git a/generated/nirfmxvna/nirfmxvna_library_interface.h b/generated/nirfmxvna/nirfmxvna_library_interface.h index 09bda40e0..af4437022 100644 --- a/generated/nirfmxvna/nirfmxvna_library_interface.h +++ b/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; diff --git a/generated/nirfmxvna/nirfmxvna_mock_library.h b/generated/nirfmxvna/nirfmxvna_mock_library.h index 68e5223be..1255c3ed5 100644 --- a/generated/nirfmxvna/nirfmxvna_mock_library.h +++ b/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)); diff --git a/generated/nirfmxvna/nirfmxvna_service.cpp b/generated/nirfmxvna/nirfmxvna_service.cpp index a5a35b8a0..9a7826333 100644 --- a/generated/nirfmxvna/nirfmxvna_service.cpp +++ b/generated/nirfmxvna/nirfmxvna_service.cpp @@ -3946,9 +3946,9 @@ namespace nirfmxvna_grpc { niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name()); auto selector_string_mbcs = convert_from_grpc(request->selector_string()); char* selector_string = (char*)selector_string_mbcs.c_str(); - auto memory_data_name_mbcs = convert_from_grpc(request->memory_data_name()); - char* memory_data_name = (char*)memory_data_name_mbcs.c_str(); - auto status = library_->CopyDataToMeasurementMemory(instrument, selector_string, memory_data_name); + auto measurement_memory_name_mbcs = convert_from_grpc(request->measurement_memory_name()); + char* measurement_memory_name = (char*)measurement_memory_name_mbcs.c_str(); + auto status = library_->CopyDataToMeasurementMemory(instrument, selector_string, measurement_memory_name); if (!status_ok(status)) { return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument); } @@ -5297,9 +5297,9 @@ namespace nirfmxvna_grpc { char* file_path = (char*)file_path_mbcs.c_str(); auto parameter_mbcs = convert_from_grpc(request->parameter()); char* parameter = (char*)parameter_mbcs.c_str(); - auto memory_data_name_mbcs = convert_from_grpc(request->memory_data_name()); - char* memory_data_name = (char*)memory_data_name_mbcs.c_str(); - auto status = library_->LoadDataToMeasurementMemoryFromFile(instrument, selector_string, file_path, parameter, memory_data_name); + auto measurement_memory_name_mbcs = convert_from_grpc(request->measurement_memory_name()); + char* measurement_memory_name = (char*)measurement_memory_name_mbcs.c_str(); + auto status = library_->LoadDataToMeasurementMemoryFromFile(instrument, selector_string, file_path, parameter, measurement_memory_name); if (!status_ok(status)) { return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument); } diff --git a/imports/include/niRFmxSpecAn.h b/imports/include/niRFmxSpecAn.h index 9cd8063d8..b8c1d5053 100644 --- a/imports/include/niRFmxSpecAn.h +++ b/imports/include/niRFmxSpecAn.h @@ -415,6 +415,7 @@ #define RFMXSPECAN_ATTR_AMPM_THRESHOLD_ENABLED 0x0010e00d #define RFMXSPECAN_ATTR_AMPM_THRESHOLD_TYPE 0x0010e00e #define RFMXSPECAN_ATTR_AMPM_THRESHOLD_LEVEL 0x0010e00f +#define RFMXSPECAN_ATTR_AMPM_THRESHOLD_DEFINITION 0x0010e03c #define RFMXSPECAN_ATTR_AMPM_FREQUENCY_OFFSET_CORRECTION_ENABLED 0x0010e021 #define RFMXSPECAN_ATTR_AMPM_IQ_ORIGIN_OFFSET_CORRECTION_ENABLED 0x0010e029 #define RFMXSPECAN_ATTR_AMPM_AM_TO_AM_ENABLED 0x0010e031 @@ -469,6 +470,7 @@ #define RFMXSPECAN_ATTR_DPD_LOOKUP_TABLE_THRESHOLD_ENABLED 0x0010f00d #define RFMXSPECAN_ATTR_DPD_LOOKUP_TABLE_THRESHOLD_TYPE 0x0010f00e #define RFMXSPECAN_ATTR_DPD_LOOKUP_TABLE_THRESHOLD_LEVEL 0x0010f00f +#define RFMXSPECAN_ATTR_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION 0x0010f06d #define RFMXSPECAN_ATTR_DPD_LOOKUP_TABLE_STEP_SIZE 0x0010f010 #define RFMXSPECAN_ATTR_DPD_MEMORY_POLYNOMIAL_ORDER 0x0010f011 #define RFMXSPECAN_ATTR_DPD_MEMORY_POLYNOMIAL_MEMORY_DEPTH 0x0010f012 @@ -1430,6 +1432,10 @@ #define RFMXSPECAN_VAL_AMPM_THRESHOLD_TYPE_RELATIVE 0 #define RFMXSPECAN_VAL_AMPM_THRESHOLD_TYPE_ABSOLUTE 1 +// Values for RFMXSPECAN_ATTR_AMPM_THRESHOLD_DEFINITION +#define RFMXSPECAN_VAL_AMPM_THRESHOLD_DEFINITION_INPUT_AND_OUTPUT 0 +#define RFMXSPECAN_VAL_AMPM_THRESHOLD_DEFINITION_REFERENCE_POWER_TYPE 1 + // Values for RFMXSPECAN_ATTR_AMPM_FREQUENCY_OFFSET_CORRECTION_ENABLED #define RFMXSPECAN_VAL_AMPM_FREQUENCY_OFFSET_CORRECTION_ENABLED_FALSE 0 #define RFMXSPECAN_VAL_AMPM_FREQUENCY_OFFSET_CORRECTION_ENABLED_TRUE 1 @@ -1521,6 +1527,10 @@ #define RFMXSPECAN_VAL_DPD_LOOKUP_TABLE_THRESHOLD_TYPE_RELATIVE 0 #define RFMXSPECAN_VAL_DPD_LOOKUP_TABLE_THRESHOLD_TYPE_ABSOLUTE 1 +// Values for RFMXSPECAN_ATTR_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION +#define RFMXSPECAN_VAL_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION_INPUT_AND_OUTPUT 0 +#define RFMXSPECAN_VAL_DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION_INPUT 1 + // Values for RFMXSPECAN_ATTR_DPD_MEMORY_POLYNOMIAL_ORDER_TYPE #define RFMXSPECAN_VAL_DPD_MEMORY_POLYNOMIAL_ORDER_TYPE_ALL_ORDERS 0 #define RFMXSPECAN_VAL_DPD_MEMORY_POLYNOMIAL_ORDER_TYPE_ODD_ORDERS_ONLY 1 @@ -9959,6 +9969,18 @@ int32 __stdcall RFmxSpecAn_AMPMSetThresholdLevel( float64 attrVal ); +int32 __stdcall RFmxSpecAn_AMPMGetThresholdDefinition( + niRFmxInstrHandle instrumentHandle, + char selectorString[], + int32 *attrVal +); + +int32 __stdcall RFmxSpecAn_AMPMSetThresholdDefinition( + niRFmxInstrHandle instrumentHandle, + char selectorString[], + int32 attrVal +); + int32 __stdcall RFmxSpecAn_AMPMGetFrequencyOffsetCorrectionEnabled( niRFmxInstrHandle instrumentHandle, char selectorString[], @@ -10528,6 +10550,18 @@ int32 __stdcall RFmxSpecAn_DPDSetLookupTableThresholdLevel( float64 attrVal ); +int32 __stdcall RFmxSpecAn_DPDGetLookupTableThresholdDefinition( + niRFmxInstrHandle instrumentHandle, + char selectorString[], + int32 *attrVal +); + +int32 __stdcall RFmxSpecAn_DPDSetLookupTableThresholdDefinition( + niRFmxInstrHandle instrumentHandle, + char selectorString[], + int32 attrVal +); + int32 __stdcall RFmxSpecAn_DPDGetLookupTableStepSize( niRFmxInstrHandle instrumentHandle, char selectorString[], diff --git a/imports/include/niRFmxVNA.h b/imports/include/niRFmxVNA.h index 9e4bb1535..2d952a80a 100644 --- a/imports/include/niRFmxVNA.h +++ b/imports/include/niRFmxVNA.h @@ -614,6 +614,13 @@ int32 __stdcall RFmxVNA_BuildMarkerString( char selectorStringOut[] ); +int32 __stdcall RFmxVNA_BuildMeasurementMemoryString( + char selectorString[], + char memoryDataName[], + int32 selectorStringOutLength, + char selectorStringOut[] +); + int32 __stdcall RFmxVNA_SetAttributeI8( niRFmxInstrHandle instrumentHandle, char selectorString[], @@ -1078,13 +1085,13 @@ int32 __stdcall RFmxVNA_LoadDataToMeasurementMemoryFromFile( char selectorString[], char filePath[], char parameter[], - char memoryDataName[] + char measurementMemoryName[] ); int32 __stdcall RFmxVNA_CopyDataToMeasurementMemory( niRFmxInstrHandle instrumentHandle, char selectorString[], - char memoryDataName[] + char measurementMemoryName[] ); int32 __stdcall RFmxVNA_ClearMeasurementMemoryNames( diff --git a/source/codegen/metadata/nirfmxspecan/attributes.py b/source/codegen/metadata/nirfmxspecan/attributes.py index b5086db68..e0eb80981 100644 --- a/source/codegen/metadata/nirfmxspecan/attributes.py +++ b/source/codegen/metadata/nirfmxspecan/attributes.py @@ -2428,6 +2428,12 @@ 'name': 'AMPM_RESULTS_PEAK_REFERENCE_POWER_GAIN', 'type': 'float64' }, + 1105980: { + 'access': 'read-write', + 'enum': 'AmpmThresholdDefinition', + 'name': 'AMPM_THRESHOLD_DEFINITION', + 'type': 'int32' + }, 1110016: { 'access': 'read-write', 'name': 'DPD_MEASUREMENT_ENABLED', @@ -2876,6 +2882,12 @@ 'name': 'DPD_MEASUREMENT_MODE', 'type': 'int32' }, + 1110125: { + 'access': 'read-write', + 'enum': 'DpdLookupTableThresholdDefinition', + 'name': 'DPD_LOOKUP_TABLE_THRESHOLD_DEFINITION', + 'type': 'int32' + }, 1110272: { 'access': 'read-write', 'name': 'IQ_MEASUREMENT_ENABLED', diff --git a/source/codegen/metadata/nirfmxspecan/config.py b/source/codegen/metadata/nirfmxspecan/config.py index 880e6c2d4..c59a3ea4f 100644 --- a/source/codegen/metadata/nirfmxspecan/config.py +++ b/source/codegen/metadata/nirfmxspecan/config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- config = { - 'api_version': '24.8.0', + 'api_version': '25.0.0', 'c_header': 'niRFmxSpecAn.h', 'c_function_prefix': 'RFmxSpecAn_', 'service_class_prefix': 'NiRFmxSpecAn', diff --git a/source/codegen/metadata/nirfmxspecan/enums.py b/source/codegen/metadata/nirfmxspecan/enums.py index e5f6c81bf..c30430868 100644 --- a/source/codegen/metadata/nirfmxspecan/enums.py +++ b/source/codegen/metadata/nirfmxspecan/enums.py @@ -615,6 +615,18 @@ } ] }, + 'AmpmThresholdDefinition': { + 'values': [ + { + 'name': 'INPUT_AND_OUTPUT', + 'value': 0 + }, + { + 'name': 'REFERENCE_POWER_TYPE', + 'value': 1 + } + ] + }, 'AmpmThresholdEnabled': { 'values': [ { @@ -1256,6 +1268,18 @@ } ] }, + 'DpdLookupTableThresholdDefinition': { + 'values': [ + { + 'name': 'INPUT_AND_OUTPUT', + 'value': 0 + }, + { + 'name': 'INPUT', + 'value': 1 + } + ] + }, 'DpdLookupTableThresholdEnabled': { 'values': [ { diff --git a/source/codegen/metadata/nirfmxvna/functions.py b/source/codegen/metadata/nirfmxvna/functions.py index 54d7d4124..2fc524235 100644 --- a/source/codegen/metadata/nirfmxvna/functions.py +++ b/source/codegen/metadata/nirfmxvna/functions.py @@ -3053,7 +3053,7 @@ }, { 'direction': 'in', - 'name': 'memoryDataName', + 'name': 'measurementMemoryName', 'type': 'char[]' } ], @@ -4299,7 +4299,7 @@ }, { 'direction': 'in', - 'name': 'memoryDataName', + 'name': 'measurementMemoryName', 'type': 'char[]' } ],