Skip to content

Commit

Permalink
SpecAn correction DPDCfgTargetWaveform -> DPDCfgExtractModelTargetWav…
Browse files Browse the repository at this point in the history 
…eform (#1093)

Co-authored-by: rnagaraj <[email protected]>
  • Loading branch information
@RahulBenaka @RahulNagaraju15
RahulBenaka and RahulNagaraju15 authored Sep 18, 2024
1 parent 79f9361 commit 6c3964a
Show file tree
Hide file tree
Showing 12 changed files with 282 additions and 282 deletions.
54 changes: 27 additions & 27 deletions generated/nirfmxspecan/nirfmxspecan.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ service NiRFmxSpecAn {
rpc DPDCfgAveraging(DPDCfgAveragingRequest) returns (DPDCfgAveragingResponse);
rpc DPDCfgDPDModel(DPDCfgDPDModelRequest) returns (DPDCfgDPDModelResponse);
rpc DPDCfgDUTAverageInputPower(DPDCfgDUTAverageInputPowerRequest) returns (DPDCfgDUTAverageInputPowerResponse);
rpc DPDCfgExtractModelTargetWaveform(DPDCfgExtractModelTargetWaveformRequest) returns (DPDCfgExtractModelTargetWaveformResponse);
rpc DPDCfgExtractModelTargetWaveformSplit(DPDCfgExtractModelTargetWaveformSplitRequest) returns (DPDCfgExtractModelTargetWaveformSplitResponse);
rpc DPDCfgGeneralizedMemoryPolynomialCrossTerms(DPDCfgGeneralizedMemoryPolynomialCrossTermsRequest) returns (DPDCfgGeneralizedMemoryPolynomialCrossTermsResponse);
rpc DPDCfgIterativeDPDEnabled(DPDCfgIterativeDPDEnabledRequest) returns (DPDCfgIterativeDPDEnabledResponse);
rpc DPDCfgLookupTableAMToAMCurveFit(DPDCfgLookupTableAMToAMCurveFitRequest) returns (DPDCfgLookupTableAMToAMCurveFitResponse);
Expand All @@ -168,8 +170,6 @@ service NiRFmxSpecAn {
rpc DPDCfgReferenceWaveform(DPDCfgReferenceWaveformRequest) returns (DPDCfgReferenceWaveformResponse);
rpc DPDCfgReferenceWaveformSplit(DPDCfgReferenceWaveformSplitRequest) returns (DPDCfgReferenceWaveformSplitResponse);
rpc DPDCfgSynchronizationMethod(DPDCfgSynchronizationMethodRequest) returns (DPDCfgSynchronizationMethodResponse);
rpc DPDCfgTargetWaveform(DPDCfgTargetWaveformRequest) returns (DPDCfgTargetWaveformResponse);
rpc DPDCfgTargetWaveformSplit(DPDCfgTargetWaveformSplitRequest) returns (DPDCfgTargetWaveformSplitResponse);
rpc DPDFetchApplyDPDPreCFRPAPR(DPDFetchApplyDPDPreCFRPAPRRequest) returns (DPDFetchApplyDPDPreCFRPAPRResponse);
rpc DPDFetchAverageGain(DPDFetchAverageGainRequest) returns (DPDFetchAverageGainResponse);
rpc DPDFetchDPDPolynomial(DPDFetchDPDPolynomialRequest) returns (DPDFetchDPDPolynomialResponse);
Expand Down Expand Up @@ -4655,6 +4655,31 @@ message DPDCfgDUTAverageInputPowerResponse {
int32 status = 1;
}

message DPDCfgExtractModelTargetWaveformRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double x0 = 3;
double dx = 4;
repeated nidevice_grpc.NIComplexNumberF32 target_waveform = 5;
}

message DPDCfgExtractModelTargetWaveformResponse {
int32 status = 1;
}

message DPDCfgExtractModelTargetWaveformSplitRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double x0 = 3;
double dx = 4;
repeated float target_waveform_i = 5;
repeated float target_waveform_q = 6;
}

message DPDCfgExtractModelTargetWaveformSplitResponse {
int32 status = 1;
}

message DPDCfgGeneralizedMemoryPolynomialCrossTermsRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down Expand Up @@ -4862,31 +4887,6 @@ message DPDCfgSynchronizationMethodResponse {
int32 status = 1;
}

message DPDCfgTargetWaveformRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double x0 = 3;
double dx = 4;
repeated nidevice_grpc.NIComplexNumberF32 target_waveform = 5;
}

message DPDCfgTargetWaveformResponse {
int32 status = 1;
}

message DPDCfgTargetWaveformSplitRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double x0 = 3;
double dx = 4;
repeated float target_waveform_i = 5;
repeated float target_waveform_q = 6;
}

message DPDCfgTargetWaveformSplitResponse {
int32 status = 1;
}

message DPDFetchApplyDPDPreCFRPAPRRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down
86 changes: 43 additions & 43 deletions generated/nirfmxspecan/nirfmxspecan_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3077,6 +3077,49 @@ dpd_cfg_dut_average_input_power(const StubPtr& stub, const nidevice_grpc::Sessio
return response;
}

DPDCfgExtractModelTargetWaveformResponse
dpd_cfg_extract_model_target_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<nidevice_grpc::NIComplexNumberF32>& target_waveform)
{
::grpc::ClientContext context;

auto request = DPDCfgExtractModelTargetWaveformRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_x0(x0);
request.set_dx(dx);
copy_array(target_waveform, request.mutable_target_waveform());

auto response = DPDCfgExtractModelTargetWaveformResponse{};

raise_if_error(
stub->DPDCfgExtractModelTargetWaveform(&context, request, &response),
context);

return response;
}

DPDCfgExtractModelTargetWaveformSplitResponse
dpd_cfg_extract_model_target_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<float>& target_waveform_i, const std::vector<float>& target_waveform_q)
{
::grpc::ClientContext context;

auto request = DPDCfgExtractModelTargetWaveformSplitRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_x0(x0);
request.set_dx(dx);
copy_array(target_waveform_i, request.mutable_target_waveform_i());
copy_array(target_waveform_q, request.mutable_target_waveform_q());

auto response = DPDCfgExtractModelTargetWaveformSplitResponse{};

raise_if_error(
stub->DPDCfgExtractModelTargetWaveformSplit(&context, request, &response),
context);

return response;
}

DPDCfgGeneralizedMemoryPolynomialCrossTermsResponse
dpd_cfg_generalized_memory_polynomial_cross_terms(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& memory_polynomial_lead_order, const pb::int32& memory_polynomial_lag_order, const pb::int32& memory_polynomial_lead_memory_depth, const pb::int32& memory_polynomial_lag_memory_depth, const pb::int32& memory_polynomial_maximum_lead, const pb::int32& memory_polynomial_maximum_lag)
{
Expand Down Expand Up @@ -3467,49 +3510,6 @@ dpd_cfg_synchronization_method(const StubPtr& stub, const nidevice_grpc::Session
return response;
}

DPDCfgTargetWaveformResponse
dpd_cfg_target_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<nidevice_grpc::NIComplexNumberF32>& target_waveform)
{
::grpc::ClientContext context;

auto request = DPDCfgTargetWaveformRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_x0(x0);
request.set_dx(dx);
copy_array(target_waveform, request.mutable_target_waveform());

auto response = DPDCfgTargetWaveformResponse{};

raise_if_error(
stub->DPDCfgTargetWaveform(&context, request, &response),
context);

return response;
}

DPDCfgTargetWaveformSplitResponse
dpd_cfg_target_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<float>& target_waveform_i, const std::vector<float>& target_waveform_q)
{
::grpc::ClientContext context;

auto request = DPDCfgTargetWaveformSplitRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_x0(x0);
request.set_dx(dx);
copy_array(target_waveform_i, request.mutable_target_waveform_i());
copy_array(target_waveform_q, request.mutable_target_waveform_q());

auto response = DPDCfgTargetWaveformSplitResponse{};

raise_if_error(
stub->DPDCfgTargetWaveformSplit(&context, request, &response),
context);

return response;
}

DPDFetchApplyDPDPreCFRPAPRResponse
dpd_fetch_apply_dpd_pre_cfrpapr(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down
4 changes: 2 additions & 2 deletions generated/nirfmxspecan/nirfmxspecan_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ DPDCfgApplyDPDUserLookupTableSplitResponse dpd_cfg_apply_dpd_user_lookup_table_s
DPDCfgAveragingResponse dpd_cfg_averaging(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<DpdAveragingEnabled, pb::int32>& averaging_enabled, const pb::int32& averaging_count);
DPDCfgDPDModelResponse dpd_cfg_dpd_model(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<DpdModel, pb::int32>& dpd_model);
DPDCfgDUTAverageInputPowerResponse dpd_cfg_dut_average_input_power(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& dut_average_input_power);
DPDCfgExtractModelTargetWaveformResponse dpd_cfg_extract_model_target_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<nidevice_grpc::NIComplexNumberF32>& target_waveform);
DPDCfgExtractModelTargetWaveformSplitResponse dpd_cfg_extract_model_target_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<float>& target_waveform_i, const std::vector<float>& target_waveform_q);
DPDCfgGeneralizedMemoryPolynomialCrossTermsResponse dpd_cfg_generalized_memory_polynomial_cross_terms(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& memory_polynomial_lead_order, const pb::int32& memory_polynomial_lag_order, const pb::int32& memory_polynomial_lead_memory_depth, const pb::int32& memory_polynomial_lag_memory_depth, const pb::int32& memory_polynomial_maximum_lead, const pb::int32& memory_polynomial_maximum_lag);
DPDCfgIterativeDPDEnabledResponse dpd_cfg_iterative_dpd_enabled(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<DpdIterativeDpdEnabled, pb::int32>& iterative_dpd_enabled);
DPDCfgLookupTableAMToAMCurveFitResponse dpd_cfg_lookup_table_am_to_am_curve_fit(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& am_to_am_curve_fit_order, const simple_variant<DpdLookupTableAMToAMCurveFitType, pb::int32>& am_to_am_curve_fit_type);
Expand All @@ -173,8 +175,6 @@ DPDCfgPreviousDPDPolynomialSplitResponse dpd_cfg_previous_dpd_polynomial_split(c
DPDCfgReferenceWaveformResponse dpd_cfg_reference_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<nidevice_grpc::NIComplexNumberF32>& reference_waveform, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<DpdSignalType, pb::int32>& signal_type);
DPDCfgReferenceWaveformSplitResponse dpd_cfg_reference_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<float>& reference_waveform_i, const std::vector<float>& reference_waveform_q, const simple_variant<DpdReferenceWaveformIdleDurationPresent, pb::int32>& idle_duration_present, const simple_variant<DpdSignalType, pb::int32>& signal_type);
DPDCfgSynchronizationMethodResponse dpd_cfg_synchronization_method(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<DpdSynchronizationMethod, pb::int32>& synchronization_method);
DPDCfgTargetWaveformResponse dpd_cfg_target_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<nidevice_grpc::NIComplexNumberF32>& target_waveform);
DPDCfgTargetWaveformSplitResponse dpd_cfg_target_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& x0, const double& dx, const std::vector<float>& target_waveform_i, const std::vector<float>& target_waveform_q);
DPDFetchApplyDPDPreCFRPAPRResponse dpd_fetch_apply_dpd_pre_cfrpapr(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
DPDFetchAverageGainResponse dpd_fetch_average_gain(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
DPDFetchDPDPolynomialResponse dpd_fetch_dpd_polynomial(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
Expand Down
20 changes: 10 additions & 10 deletions generated/nirfmxspecan/nirfmxspecan_compilation_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,16 @@ int32 DPDCfgDUTAverageInputPower(niRFmxInstrHandle instrumentHandle, char select
return RFmxSpecAn_DPDCfgDUTAverageInputPower(instrumentHandle, selectorString, dutAverageInputPower);
}

int32 DPDCfgExtractModelTargetWaveform(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 x0, float64 dx, NIComplexSingle targetWaveform[], int32 arraySize)
{
return RFmxSpecAn_DPDCfgExtractModelTargetWaveform(instrumentHandle, selectorString, x0, dx, targetWaveform, arraySize);
}

int32 DPDCfgExtractModelTargetWaveformSplit(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 x0, float64 dx, float32 targetWaveformI[], float32 targetWaveformQ[], int32 arraySize)
{
return RFmxSpecAn_DPDCfgExtractModelTargetWaveformSplit(instrumentHandle, selectorString, x0, dx, targetWaveformI, targetWaveformQ, arraySize);
}

int32 DPDCfgGeneralizedMemoryPolynomialCrossTerms(niRFmxInstrHandle instrumentHandle, char selectorString[], int32 memoryPolynomialLeadOrder, int32 memoryPolynomialLagOrder, int32 memoryPolynomialLeadMemoryDepth, int32 memoryPolynomialLagMemoryDepth, int32 memoryPolynomialMaximumLead, int32 memoryPolynomialMaximumLag)
{
return RFmxSpecAn_DPDCfgGeneralizedMemoryPolynomialCrossTerms(instrumentHandle, selectorString, memoryPolynomialLeadOrder, memoryPolynomialLagOrder, memoryPolynomialLeadMemoryDepth, memoryPolynomialLagMemoryDepth, memoryPolynomialMaximumLead, memoryPolynomialMaximumLag);
Expand Down Expand Up @@ -762,16 +772,6 @@ int32 DPDCfgSynchronizationMethod(niRFmxInstrHandle instrumentHandle, char selec
return RFmxSpecAn_DPDCfgSynchronizationMethod(instrumentHandle, selectorString, synchronizationMethod);
}

int32 DPDCfgTargetWaveform(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 x0, float64 dx, NIComplexSingle targetWaveform[], int32 arraySize)
{
return RFmxSpecAn_DPDCfgTargetWaveform(instrumentHandle, selectorString, x0, dx, targetWaveform, arraySize);
}

int32 DPDCfgTargetWaveformSplit(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 x0, float64 dx, float32 targetWaveformI[], float32 targetWaveformQ[], int32 arraySize)
{
return RFmxSpecAn_DPDCfgTargetWaveformSplit(instrumentHandle, selectorString, x0, dx, targetWaveformI, targetWaveformQ, arraySize);
}

int32 DPDFetchApplyDPDPreCFRPAPR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* preCFRPAPR)
{
return RFmxSpecAn_DPDFetchApplyDPDPreCFRPAPR(instrumentHandle, selectorString, timeout, preCFRPAPR);
Expand Down
Loading

0 comments on commit 6c3964a

Please sign in to comment.