Skip to content
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

Fix missing "grpc name" from two RFmx restricted functions #1053

Merged
merged 2 commits into from
Apr 17, 2024
+18 −16
Merged

Fix missing "grpc name" from two RFmx restricted functions #1053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1780dca
Missing grpc_name from two restricted functions
paulolamas18 Apr 15, 2024
0f4c4dc
Codegen outputs
paulolamas18 Apr 16, 2024
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
2 changes: 1 addition & 1 deletion generated/nirfmxspecan_restricted/nirfmxspecan_restricted.proto
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ enum AmpmSignalType {
}

message AMPMLoadReferenceWaveformFromTDMSFileRequest {
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 {
4 changes: 2 additions & 2 deletions generated/nirfmxspecan_restricted/nirfmxspecan_restricted_client.cpp
View file
Original file line number Diff line number Diff line change
@@ -18,12 +18,12 @@
namespace nirfmxspecan_restricted_grpc::experimental::client {

AMPMLoadReferenceWaveformFromTDMSFileResponse
ampm_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<AmpmReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<AmpmSignalType, pb::int32>& signal_type, const pb::int32& waveform_index)
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)
{
::grpc::ClientContext context;

auto request = AMPMLoadReferenceWaveformFromTDMSFileRequest{};
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<AmpmReferenceWaveformIdleDurationPresent>();
2 changes: 1 addition & 1 deletion generated/nirfmxspecan_restricted/nirfmxspecan_restricted_client.h
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ using StubPtr = std::unique_ptr<NiRFmxSpecAnRestricted::Stub>;
using namespace nidevice_grpc::experimental::client;


AMPMLoadReferenceWaveformFromTDMSFileResponse ampm_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<AmpmReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<AmpmSignalType, pb::int32>& signal_type, const pb::int32& waveform_index);
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);

8 changes: 4 additions & 4 deletions generated/nirfmxspecan_restricted/nirfmxspecan_restricted_service.cpp
View file
Original file line number Diff line number Diff line change
@@ -52,8 +52,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());
@@ -91,9 +91,9 @@ namespace nirfmxspecan_restricted_grpc {
}

int32 waveform_index = request->waveform_index();
auto status = library_->AMPMLoadReferenceWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, idle_duration_present, signal_type, waveform_index);
auto status = library_->AMPMLoadReferenceWaveformFromTDMSFile(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;
2 changes: 1 addition & 1 deletion generated/nirfmxwlan_restricted/nirfmxwlan_restricted.proto
View file
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ message OFDMModAccFetchCommonPilotErrorTraceIndBResponse {
}

message OFDMModAccLoad1ReferenceWaveformFromTDMSFileRequest {
nidevice_grpc.Session instrument_handle = 1;
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string waveform_file_path = 3;
int32 waveform_index = 4;
4 changes: 2 additions & 2 deletions generated/nirfmxwlan_restricted/nirfmxwlan_restricted_client.cpp
View file
Original file line number Diff line number Diff line change
@@ -56,12 +56,12 @@ ofdm_mod_acc_fetch_common_pilot_error_trace_ind_b(const StubPtr& stub, const nid
}

OFDMModAccLoad1ReferenceWaveformFromTDMSFileResponse
ofdm_mod_acc_load1_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 pb::int32& waveform_index)
ofdm_mod_acc_load1_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 pb::int32& waveform_index)
{
::grpc::ClientContext context;

auto request = OFDMModAccLoad1ReferenceWaveformFromTDMSFileRequest{};
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);
request.set_waveform_index(waveform_index);
2 changes: 1 addition & 1 deletion generated/nirfmxwlan_restricted/nirfmxwlan_restricted_client.h
View file
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ using namespace nidevice_grpc::experimental::client;

GetChannelListResponse get_channel_list(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& wlan_band);
OFDMModAccFetchCommonPilotErrorTraceIndBResponse ofdm_mod_acc_fetch_common_pilot_error_trace_ind_b(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
OFDMModAccLoad1ReferenceWaveformFromTDMSFileResponse ofdm_mod_acc_load1_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 pb::int32& waveform_index);
OFDMModAccLoad1ReferenceWaveformFromTDMSFileResponse ofdm_mod_acc_load1_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 pb::int32& waveform_index);
OFDMModAccNoiseCalibrateResponse ofdm_mod_acc_noise_calibrate(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& shared_lo_connection);

} // namespace nirfmxwlan_restricted_grpc::experimental::client
8 changes: 4 additions & 4 deletions generated/nirfmxwlan_restricted/nirfmxwlan_restricted_service.cpp
View file
Original file line number Diff line number Diff line change
@@ -144,16 +144,16 @@ namespace nirfmxwlan_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());
char* waveform_file_path = (char*)waveform_file_path_mbcs.c_str();
int32 waveform_index = request->waveform_index();
auto status = library_->OFDMModAccLoad1ReferenceWaveformFromTDMSFile(instrument_handle, selector_string, waveform_file_path, waveform_index);
auto status = library_->OFDMModAccLoad1ReferenceWaveformFromTDMSFile(instrument, selector_string, waveform_file_path, 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;
1 change: 1 addition & 0 deletions source/codegen/metadata/nirfmxspecan_restricted/functions.py
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@
'parameters': [
{
'direction': 'in',
'grpc_name': 'instrument',
'name': 'instrumentHandle',
'type': 'niRFmxInstrHandle'
},
1 change: 1 addition & 0 deletions source/codegen/metadata/nirfmxwlan_restricted/functions.py
View file
Original file line number Diff line number Diff line change
@@ -177,6 +177,7 @@
'parameters': [
{
'direction': 'in',
'grpc_name': 'instrument',
'name': 'instrumentHandle',
'type': 'niRFmxInstrHandle'
},