Skip to content

Updating instrument parameter's gRPC Name and version to 26.0.0 for S… #1232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dheineke merged 1 commit into from
Dec 17, 2025
Merged

Updating instrument parameter's gRPC Name and version to 26.0.0 for S… #1232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions generated/nirfmxspecan_restricted/nirfmxspecan_restricted.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-RFMXSPECAN-RESTRICTED API metadata version 21.0.0
// This file is generated from NI-RFMXSPECAN-RESTRICTED API metadata version 26.0.0
//---------------------------------------------------------------------
// Proto file for the NI-RFMXSPECAN-RESTRICTED Metadata
//---------------------------------------------------------------------
Expand Down Expand Up @@ -113,7 +113,7 @@ message IQFetchDataOverrideBehaviorResponse {
}

message DPDApplyDigitalPredistortionToWaveformFromTDMSFileRequest {
nidevice_grpc.Session instrument_handle = 1;
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string waveform_file_path = 3;
oneof idle_duration_present_enum {
Expand All @@ -135,7 +135,7 @@ message DPDApplyDigitalPredistortionToWaveformFromTDMSFileResponse {
}

message DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFileRequest {
nidevice_grpc.Session instrument_handle = 1;
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string waveform_file_path = 3;
oneof idle_duration_present_enum {
Expand All @@ -155,7 +155,7 @@ message DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFileResponse {
}

message DPDLoadReferenceWaveformFromTDMSFileRequest {
nidevice_grpc.Session instrument_handle = 1;
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string waveform_file_path = 3;
oneof idle_duration_present_enum {
Expand All @@ -174,7 +174,7 @@ message DPDLoadReferenceWaveformFromTDMSFileResponse {
}

message IDPDLoadReferenceWaveformFromTDMSFileRequest {
nidevice_grpc.Session instrument_handle = 1;
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string waveform_file_path = 3;
oneof idle_duration_present_enum {
Expand Down
16 changes: 8 additions & 8 deletions generated/nirfmxspecan_restricted/nirfmxspecan_restricted_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ iq_fetch_data_override_behavior(const StubPtr& stub, const nidevice_grpc::Sessio
}

DPDApplyDigitalPredistortionToWaveformFromTDMSFileResponse
dpd_apply_digital_predistortion_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const double& measurement_timeout, const pb::int32& waveform_index)
dpd_apply_digital_predistortion_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const double& measurement_timeout, const pb::int32& waveform_index)
{
::grpc::ClientContext context;

auto request = DPDApplyDigitalPredistortionToWaveformFromTDMSFileRequest{};
request.mutable_instrument_handle()->CopyFrom(instrument_handle);
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_waveform_file_path(waveform_file_path);
const auto idle_duration_present_ptr = idle_duration_present.get_if<DpdReferenceWaveformIdleDurationPresent>();
Expand All @@ -131,12 +131,12 @@ dpd_apply_digital_predistortion_to_waveform_from_tdms_file(const StubPtr& stub,
}

DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFileResponse
dpd_apply_pre_dpd_signal_conditioning_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const pb::int32& waveform_index)
dpd_apply_pre_dpd_signal_conditioning_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const pb::int32& waveform_index)
{
::grpc::ClientContext context;

auto request = DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFileRequest{};
request.mutable_instrument_handle()->CopyFrom(instrument_handle);
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_waveform_file_path(waveform_file_path);
const auto idle_duration_present_ptr = idle_duration_present.get_if<DpdReferenceWaveformIdleDurationPresent>();
Expand All @@ -159,12 +159,12 @@ dpd_apply_pre_dpd_signal_conditioning_to_waveform_from_tdms_file(const StubPtr&
}

DPDLoadReferenceWaveformFromTDMSFileResponse
dpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<DpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index)
dpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<DpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index)
{
::grpc::ClientContext context;

auto request = DPDLoadReferenceWaveformFromTDMSFileRequest{};
request.mutable_instrument_handle()->CopyFrom(instrument_handle);
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_waveform_file_path(waveform_file_path);
const auto idle_duration_present_ptr = idle_duration_present.get_if<DpdReferenceWaveformIdleDurationPresent>();
Expand Down Expand Up @@ -195,12 +195,12 @@ dpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_g
}

IDPDLoadReferenceWaveformFromTDMSFileResponse
idpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<IdpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<IdpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index)
idpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<IdpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<IdpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index)
{
::grpc::ClientContext context;

auto request = IDPDLoadReferenceWaveformFromTDMSFileRequest{};
request.mutable_instrument_handle()->CopyFrom(instrument_handle);
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_waveform_file_path(waveform_file_path);
const auto idle_duration_present_ptr = idle_duration_present.get_if<IdpdReferenceWaveformIdleDurationPresent>();
Expand Down
8 changes: 4 additions & 4 deletions generated/nirfmxspecan_restricted/nirfmxspecan_restricted_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ using namespace nidevice_grpc::experimental::client;
AMPMLoadReferenceWaveformFromTDMSFileResponse ampm_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<AmpmReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<AmpmSignalType, pb::int32>& signal_type, const pb::int32& waveform_index);
CacheResultResponse cache_result(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& selector_string_out_size);
IQFetchDataOverrideBehaviorResponse iq_fetch_data_override_behavior(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout, const pb::int32& record_to_fetch, const pb::int64& samples_to_read, const simple_variant<IQDeleteOnFetch, pb::int32>& delete_on_fetch);
DPDApplyDigitalPredistortionToWaveformFromTDMSFileResponse dpd_apply_digital_predistortion_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const double& measurement_timeout, const pb::int32& waveform_index);
DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFileResponse dpd_apply_pre_dpd_signal_conditioning_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const pb::int32& waveform_index);
DPDLoadReferenceWaveformFromTDMSFileResponse dpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<DpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index);
IDPDLoadReferenceWaveformFromTDMSFileResponse idpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument_handle, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<IdpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<IdpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index);
DPDApplyDigitalPredistortionToWaveformFromTDMSFileResponse dpd_apply_digital_predistortion_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const double& measurement_timeout, const pb::int32& waveform_index);
DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFileResponse dpd_apply_pre_dpd_signal_conditioning_to_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const pb::int32& waveform_index);
DPDLoadReferenceWaveformFromTDMSFileResponse dpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<DpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index);
IDPDLoadReferenceWaveformFromTDMSFileResponse idpd_load_reference_waveform_from_tdms_file(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& waveform_file_path, const simple_variant<IdpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<IdpdSignalType, pb::int32>& signal_type, const pb::int32& waveform_index);

} // namespace nirfmxspecan_restricted_grpc::experimental::client

Expand Down
40 changes: 20 additions & 20 deletions generated/nirfmxspecan_restricted/nirfmxspecan_restricted_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ namespace nirfmxspecan_restricted_grpc {
return ::grpc::Status::CANCELLED;
}
try {
auto instrument_handle_grpc_session = request->instrument_handle();
niRFmxInstrHandle instrument_handle = session_repository_->access_session(instrument_handle_grpc_session.name());
auto instrument_grpc_session = request->instrument();
niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name());
auto selector_string_mbcs = convert_from_grpc<std::string>(request->selector_string());
char* selector_string = (char*)selector_string_mbcs.c_str();
auto waveform_file_path_mbcs = convert_from_grpc<std::string>(request->waveform_file_path());
Expand Down Expand Up @@ -243,19 +243,19 @@ namespace nirfmxspecan_restricted_grpc {
float64 papr {};
float64 power_offset {};
while (true) {
auto status = library_->DPDApplyDigitalPredistortionToWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, measurement_timeout, waveform_index, &x0_out, &dx_out, nullptr, 0, &actual_array_size, &papr, &power_offset);
auto status = library_->DPDApplyDigitalPredistortionToWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, idle_duration_present, measurement_timeout, waveform_index, &x0_out, &dx_out, nullptr, 0, &actual_array_size, &papr, &power_offset);
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument_handle);
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
std::vector<NIComplexSingle> waveform_out(actual_array_size, NIComplexSingle());
auto array_size_out = actual_array_size;
status = library_->DPDApplyDigitalPredistortionToWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, measurement_timeout, waveform_index, &x0_out, &dx_out, waveform_out.data(), array_size_out, &actual_array_size, &papr, &power_offset);
status = library_->DPDApplyDigitalPredistortionToWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, idle_duration_present, measurement_timeout, waveform_index, &x0_out, &dx_out, waveform_out.data(), array_size_out, &actual_array_size, &papr, &power_offset);
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer) {
// buffer is now too small, try again
continue;
}
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument_handle);
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
response->set_x0_out(x0_out);
Expand Down Expand Up @@ -287,8 +287,8 @@ namespace nirfmxspecan_restricted_grpc {
return ::grpc::Status::CANCELLED;
}
try {
auto instrument_handle_grpc_session = request->instrument_handle();
niRFmxInstrHandle instrument_handle = session_repository_->access_session(instrument_handle_grpc_session.name());
auto instrument_grpc_session = request->instrument();
niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name());
auto selector_string_mbcs = convert_from_grpc<std::string>(request->selector_string());
char* selector_string = (char*)selector_string_mbcs.c_str();
auto waveform_file_path_mbcs = convert_from_grpc<std::string>(request->waveform_file_path());
Expand All @@ -315,19 +315,19 @@ namespace nirfmxspecan_restricted_grpc {
int32 actual_array_size {};
float64 papr {};
while (true) {
auto status = library_->DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, waveform_index, &x0_out, &dx_out, nullptr, 0, &actual_array_size, &papr);
auto status = library_->DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, idle_duration_present, waveform_index, &x0_out, &dx_out, nullptr, 0, &actual_array_size, &papr);
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument_handle);
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
std::vector<NIComplexSingle> waveform_out(actual_array_size, NIComplexSingle());
auto array_size_out = actual_array_size;
status = library_->DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, waveform_index, &x0_out, &dx_out, waveform_out.data(), array_size_out, &actual_array_size, &papr);
status = library_->DPDApplyPreDPDSignalConditioningToWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, idle_duration_present, waveform_index, &x0_out, &dx_out, waveform_out.data(), array_size_out, &actual_array_size, &papr);
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer) {
// buffer is now too small, try again
continue;
}
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument_handle);
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
response->set_x0_out(x0_out);
Expand Down Expand Up @@ -358,8 +358,8 @@ namespace nirfmxspecan_restricted_grpc {
return ::grpc::Status::CANCELLED;
}
try {
auto instrument_handle_grpc_session = request->instrument_handle();
niRFmxInstrHandle instrument_handle = session_repository_->access_session(instrument_handle_grpc_session.name());
auto instrument_grpc_session = request->instrument();
niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name());
auto selector_string_mbcs = convert_from_grpc<std::string>(request->selector_string());
char* selector_string = (char*)selector_string_mbcs.c_str();
auto waveform_file_path_mbcs = convert_from_grpc<std::string>(request->waveform_file_path());
Expand Down Expand Up @@ -397,9 +397,9 @@ namespace nirfmxspecan_restricted_grpc {
}

int32 waveform_index = request->waveform_index();
auto status = library_->DPDLoadReferenceWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, signal_type, waveform_index);
auto status = library_->DPDLoadReferenceWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, idle_duration_present, signal_type, waveform_index);
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument_handle);
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
return ::grpc::Status::OK;
Expand All @@ -417,8 +417,8 @@ namespace nirfmxspecan_restricted_grpc {
return ::grpc::Status::CANCELLED;
}
try {
auto instrument_handle_grpc_session = request->instrument_handle();
niRFmxInstrHandle instrument_handle = session_repository_->access_session(instrument_handle_grpc_session.name());
auto instrument_grpc_session = request->instrument();
niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name());
auto selector_string_mbcs = convert_from_grpc<std::string>(request->selector_string());
char* selector_string = (char*)selector_string_mbcs.c_str();
auto waveform_file_path_mbcs = convert_from_grpc<std::string>(request->waveform_file_path());
Expand Down Expand Up @@ -456,9 +456,9 @@ namespace nirfmxspecan_restricted_grpc {
}

int32 waveform_index = request->waveform_index();
auto status = library_->IDPDLoadReferenceWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, signal_type, waveform_index);
auto status = library_->IDPDLoadReferenceWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, idle_duration_present, signal_type, waveform_index);
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument_handle);
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
return ::grpc::Status::OK;
Expand Down
Loading
Loading