Skip to content

Commit

Permalink
Split APIs addition for CDMA2k, Demod, Gsm, Tdscdma and Wcdma (#1096)
Browse files Browse the repository at this point in the history 
Co-authored-by: rnagaraj <[email protected]>
  • Loading branch information
@RahulBenaka @RahulNagaraju15
RahulBenaka and RahulNagaraju15 authored Sep 20, 2024
1 parent cdefbae commit 619d182
Show file tree
Hide file tree
Showing 60 changed files with 4,293 additions and 74 deletions.
58 changes: 58 additions & 0 deletions generated/nirfmxcdma2k/nirfmxcdma2k.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ service NiRFmxCDMA2k {
rpc ACPFetchSpectrum(ACPFetchSpectrumRequest) returns (ACPFetchSpectrumResponse);
rpc AbortMeasurements(AbortMeasurementsRequest) returns (AbortMeasurementsResponse);
rpc AnalyzeIQ1Waveform(AnalyzeIQ1WaveformRequest) returns (AnalyzeIQ1WaveformResponse);
rpc AnalyzeIQ1WaveformSplit(AnalyzeIQ1WaveformSplitRequest) returns (AnalyzeIQ1WaveformSplitResponse);
rpc AnalyzeSpectrum1Waveform(AnalyzeSpectrum1WaveformRequest) returns (AnalyzeSpectrum1WaveformResponse);
rpc AutoLevel(AutoLevelRequest) returns (AutoLevelResponse);
rpc BuildChannelString(BuildChannelStringRequest) returns (BuildChannelStringResponse);
Expand All @@ -44,6 +45,7 @@ service NiRFmxCDMA2k {
rpc CDAFetchCodeDomainPower(CDAFetchCodeDomainPowerRequest) returns (CDAFetchCodeDomainPowerResponse);
rpc CDAFetchIQImpairments(CDAFetchIQImpairmentsRequest) returns (CDAFetchIQImpairmentsResponse);
rpc CDAFetchSymbolConstellationTrace(CDAFetchSymbolConstellationTraceRequest) returns (CDAFetchSymbolConstellationTraceResponse);
rpc CDAFetchSymbolConstellationTraceSplit(CDAFetchSymbolConstellationTraceSplitRequest) returns (CDAFetchSymbolConstellationTraceSplitResponse);
rpc CDAFetchSymbolEVM(CDAFetchSymbolEVMRequest) returns (CDAFetchSymbolEVMResponse);
rpc CDAFetchSymbolEVMTrace(CDAFetchSymbolEVMTraceRequest) returns (CDAFetchSymbolEVMTraceResponse);
rpc CDAFetchSymbolMagnitudeErrorTrace(CDAFetchSymbolMagnitudeErrorTraceRequest) returns (CDAFetchSymbolMagnitudeErrorTraceResponse);
Expand Down Expand Up @@ -109,6 +111,7 @@ service NiRFmxCDMA2k {
rpc Initiate(InitiateRequest) returns (InitiateResponse);
rpc ModAccCfgSynchronizationModeAndInterval(ModAccCfgSynchronizationModeAndIntervalRequest) returns (ModAccCfgSynchronizationModeAndIntervalResponse);
rpc ModAccFetchConstellationTrace(ModAccFetchConstellationTraceRequest) returns (ModAccFetchConstellationTraceResponse);
rpc ModAccFetchConstellationTraceSplit(ModAccFetchConstellationTraceSplitRequest) returns (ModAccFetchConstellationTraceSplitResponse);
rpc ModAccFetchDetectedChannel(ModAccFetchDetectedChannelRequest) returns (ModAccFetchDetectedChannelResponse);
rpc ModAccFetchDetectedChannelArray(ModAccFetchDetectedChannelArrayRequest) returns (ModAccFetchDetectedChannelArrayResponse);
rpc ModAccFetchEVM(ModAccFetchEVMRequest) returns (ModAccFetchEVMResponse);
Expand All @@ -127,6 +130,7 @@ service NiRFmxCDMA2k {
rpc QEVMCfgAveraging(QEVMCfgAveragingRequest) returns (QEVMCfgAveragingResponse);
rpc QEVMCfgMeasurementLength(QEVMCfgMeasurementLengthRequest) returns (QEVMCfgMeasurementLengthResponse);
rpc QEVMFetchConstellationTrace(QEVMFetchConstellationTraceRequest) returns (QEVMFetchConstellationTraceResponse);
rpc QEVMFetchConstellationTraceSplit(QEVMFetchConstellationTraceSplitRequest) returns (QEVMFetchConstellationTraceSplitResponse);
rpc QEVMFetchEVM(QEVMFetchEVMRequest) returns (QEVMFetchEVMResponse);
rpc QEVMFetchEVMTrace(QEVMFetchEVMTraceRequest) returns (QEVMFetchEVMTraceResponse);
rpc QEVMFetchIQImpairments(QEVMFetchIQImpairmentsRequest) returns (QEVMFetchIQImpairmentsResponse);
Expand Down Expand Up @@ -1077,6 +1081,21 @@ message AnalyzeIQ1WaveformResponse {
int32 status = 1;
}

message AnalyzeIQ1WaveformSplitRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string result_name = 3;
double x0 = 4;
double dx = 5;
repeated float iqi = 6;
repeated float iqq = 7;
int32 reset = 8;
}

message AnalyzeIQ1WaveformSplitResponse {
int32 status = 1;
}

message AnalyzeSpectrum1WaveformRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down Expand Up @@ -1243,6 +1262,19 @@ message CDAFetchSymbolConstellationTraceResponse {
int32 actual_array_size = 3;
}

message CDAFetchSymbolConstellationTraceSplitRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double timeout = 3;
}

message CDAFetchSymbolConstellationTraceSplitResponse {
int32 status = 1;
repeated float symbol_constellation_i = 2;
repeated float symbol_constellation_q = 3;
int32 actual_array_size = 4;
}

message CDAFetchSymbolEVMRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down Expand Up @@ -2033,6 +2065,19 @@ message ModAccFetchConstellationTraceResponse {
int32 actual_array_size = 3;
}

message ModAccFetchConstellationTraceSplitRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double timeout = 3;
}

message ModAccFetchConstellationTraceSplitResponse {
int32 status = 1;
repeated float constellation_i = 2;
repeated float constellation_q = 3;
int32 actual_array_size = 4;
}

message ModAccFetchDetectedChannelRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down Expand Up @@ -2288,6 +2333,19 @@ message QEVMFetchConstellationTraceResponse {
int32 actual_array_size = 3;
}

message QEVMFetchConstellationTraceSplitRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
double timeout = 3;
}

message QEVMFetchConstellationTraceSplitResponse {
int32 status = 1;
repeated float constellation_i = 2;
repeated float constellation_q = 3;
int32 actual_array_size = 4;
}

message QEVMFetchEVMRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down
81 changes: 81 additions & 0 deletions generated/nirfmxcdma2k/nirfmxcdma2k_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,30 @@ analyze_iq1_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrume
return response;
}

AnalyzeIQ1WaveformSplitResponse
analyze_iq1_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name, const double& x0, const double& dx, const std::vector<float>& iqi, const std::vector<float>& iqq, const pb::int32& reset)
{
::grpc::ClientContext context;

auto request = AnalyzeIQ1WaveformSplitRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_result_name(result_name);
request.set_x0(x0);
request.set_dx(dx);
copy_array(iqi, request.mutable_iqi());
copy_array(iqq, request.mutable_iqq());
request.set_reset(reset);

auto response = AnalyzeIQ1WaveformSplitResponse{};

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

return response;
}

AnalyzeSpectrum1WaveformResponse
analyze_spectrum1_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name, const double& x0, const double& dx, const std::vector<float>& spectrum, const pb::int32& reset)
{
Expand Down Expand Up @@ -615,6 +639,25 @@ cda_fetch_symbol_constellation_trace(const StubPtr& stub, const nidevice_grpc::S
return response;
}

CDAFetchSymbolConstellationTraceSplitResponse
cda_fetch_symbol_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
::grpc::ClientContext context;

auto request = CDAFetchSymbolConstellationTraceSplitRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_timeout(timeout);

auto response = CDAFetchSymbolConstellationTraceSplitResponse{};

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

return response;
}

CDAFetchSymbolEVMResponse
cda_fetch_symbol_evm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down Expand Up @@ -1992,6 +2035,25 @@ mod_acc_fetch_constellation_trace(const StubPtr& stub, const nidevice_grpc::Sess
return response;
}

ModAccFetchConstellationTraceSplitResponse
mod_acc_fetch_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
::grpc::ClientContext context;

auto request = ModAccFetchConstellationTraceSplitRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_timeout(timeout);

auto response = ModAccFetchConstellationTraceSplitResponse{};

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

return response;
}

ModAccFetchDetectedChannelResponse
mod_acc_fetch_detected_channel(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down Expand Up @@ -2382,6 +2444,25 @@ qevm_fetch_constellation_trace(const StubPtr& stub, const nidevice_grpc::Session
return response;
}

QEVMFetchConstellationTraceSplitResponse
qevm_fetch_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
::grpc::ClientContext context;

auto request = QEVMFetchConstellationTraceSplitRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_timeout(timeout);

auto response = QEVMFetchConstellationTraceSplitResponse{};

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

return response;
}

QEVMFetchEVMResponse
qevm_fetch_evm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down
4 changes: 4 additions & 0 deletions generated/nirfmxcdma2k/nirfmxcdma2k_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ACPFetchRelativePowersTraceResponse acp_fetch_relative_powers_trace(const StubPt
ACPFetchSpectrumResponse acp_fetch_spectrum(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
AbortMeasurementsResponse abort_measurements(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string);
AnalyzeIQ1WaveformResponse analyze_iq1_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name, const double& x0, const double& dx, const std::vector<nidevice_grpc::NIComplexNumberF32>& iq, const pb::int32& reset);
AnalyzeIQ1WaveformSplitResponse analyze_iq1_waveform_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name, const double& x0, const double& dx, const std::vector<float>& iqi, const std::vector<float>& iqq, const pb::int32& reset);
AnalyzeSpectrum1WaveformResponse analyze_spectrum1_waveform(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name, const double& x0, const double& dx, const std::vector<float>& spectrum, const pb::int32& reset);
AutoLevelResponse auto_level(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& measurement_interval);
BuildChannelStringResponse build_channel_string(const StubPtr& stub, const std::string& selector_string, const pb::int32& channel_number);
Expand All @@ -49,6 +50,7 @@ CDAFetchCodeDomainIAndQPowerTraceResponse cda_fetch_code_domain_i_and_q_power_tr
CDAFetchCodeDomainPowerResponse cda_fetch_code_domain_power(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
CDAFetchIQImpairmentsResponse cda_fetch_iq_impairments(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
CDAFetchSymbolConstellationTraceResponse cda_fetch_symbol_constellation_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
CDAFetchSymbolConstellationTraceSplitResponse cda_fetch_symbol_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
CDAFetchSymbolEVMResponse cda_fetch_symbol_evm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
CDAFetchSymbolEVMTraceResponse cda_fetch_symbol_evm_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
CDAFetchSymbolMagnitudeErrorTraceResponse cda_fetch_symbol_magnitude_error_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
Expand Down Expand Up @@ -114,6 +116,7 @@ InitializeFromNIRFSASessionResponse initialize_from_nirfsa_session(const StubPtr
InitiateResponse initiate(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& result_name);
ModAccCfgSynchronizationModeAndIntervalResponse mod_acc_cfg_synchronization_mode_and_interval(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<ModAccSynchronizationMode, pb::int32>& synchronization_mode, const pb::int32& measurement_offset, const pb::int32& measurement_length);
ModAccFetchConstellationTraceResponse mod_acc_fetch_constellation_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchConstellationTraceSplitResponse mod_acc_fetch_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchDetectedChannelResponse mod_acc_fetch_detected_channel(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchDetectedChannelArrayResponse mod_acc_fetch_detected_channel_array(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchEVMResponse mod_acc_fetch_evm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
Expand All @@ -132,6 +135,7 @@ OBWFetchSpectrumResponse obw_fetch_spectrum(const StubPtr& stub, const nidevice_
QEVMCfgAveragingResponse qevm_cfg_averaging(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<QevmAveragingEnabled, pb::int32>& averaging_enabled, const pb::int32& averaging_count);
QEVMCfgMeasurementLengthResponse qevm_cfg_measurement_length(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const pb::int32& measurement_length);
QEVMFetchConstellationTraceResponse qevm_fetch_constellation_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
QEVMFetchConstellationTraceSplitResponse qevm_fetch_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
QEVMFetchEVMResponse qevm_fetch_evm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
QEVMFetchEVMTraceResponse qevm_fetch_evm_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
QEVMFetchIQImpairmentsResponse qevm_fetch_iq_impairments(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
Expand Down
20 changes: 20 additions & 0 deletions generated/nirfmxcdma2k/nirfmxcdma2k_compilation_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ int32 AnalyzeIQ1Waveform(niRFmxInstrHandle instrumentHandle, char selectorString
return RFmxCDMA2k_AnalyzeIQ1Waveform(instrumentHandle, selectorString, resultName, x0, dx, iq, arraySize, reset, reserved);
}

int32 AnalyzeIQ1WaveformSplit(niRFmxInstrHandle instrumentHandle, char selectorString[], char resultName[], float64 x0, float64 dx, float32 iqi[], float32 iqq[], int32 arraySize, int32 reset, int64 reserved)
{
return RFmxCDMA2k_AnalyzeIQ1WaveformSplit(instrumentHandle, selectorString, resultName, x0, dx, iqi, iqq, arraySize, reset, reserved);
}

int32 AnalyzeSpectrum1Waveform(niRFmxInstrHandle instrumentHandle, char selectorString[], char resultName[], float64 x0, float64 dx, float32 spectrum[], int32 arraySize, int32 reset, int64 reserved)
{
return RFmxCDMA2k_AnalyzeSpectrum1Waveform(instrumentHandle, selectorString, resultName, x0, dx, spectrum, arraySize, reset, reserved);
Expand Down Expand Up @@ -142,6 +147,11 @@ int32 CDAFetchSymbolConstellationTrace(niRFmxInstrHandle instrumentHandle, char
return RFmxCDMA2k_CDAFetchSymbolConstellationTrace(instrumentHandle, selectorString, timeout, symbolConstellation, arraySize, actualArraySize);
}

int32 CDAFetchSymbolConstellationTraceSplit(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 symbolConstellationI[], float32 symbolConstellationQ[], int32 arraySize, int32* actualArraySize)
{
return RFmxCDMA2k_CDAFetchSymbolConstellationTraceSplit(instrumentHandle, selectorString, timeout, symbolConstellationI, symbolConstellationQ, arraySize, actualArraySize);
}

int32 CDAFetchSymbolEVM(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* rmsSymbolEVM, float64* peakSymbolEVM, float64* rmsSymbolMagnitudeError, float64* rmsSymbolPhaseError, float64* meanSymbolPower, float64* frequencyError, float64* chipRateError)
{
return RFmxCDMA2k_CDAFetchSymbolEVM(instrumentHandle, selectorString, timeout, rmsSymbolEVM, peakSymbolEVM, rmsSymbolMagnitudeError, rmsSymbolPhaseError, meanSymbolPower, frequencyError, chipRateError);
Expand Down Expand Up @@ -467,6 +477,11 @@ int32 ModAccFetchConstellationTrace(niRFmxInstrHandle instrumentHandle, char sel
return RFmxCDMA2k_ModAccFetchConstellationTrace(instrumentHandle, selectorString, timeout, constellation, arraySize, actualArraySize);
}

int32 ModAccFetchConstellationTraceSplit(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 constellationI[], float32 constellationQ[], int32 arraySize, int32* actualArraySize)
{
return RFmxCDMA2k_ModAccFetchConstellationTraceSplit(instrumentHandle, selectorString, timeout, constellationI, constellationQ, arraySize, actualArraySize);
}

int32 ModAccFetchDetectedChannel(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, int32* detectedWalshCodeLength, int32* detectedWalshCodeNumber, int32* detectedBranch)
{
return RFmxCDMA2k_ModAccFetchDetectedChannel(instrumentHandle, selectorString, timeout, detectedWalshCodeLength, detectedWalshCodeNumber, detectedBranch);
Expand Down Expand Up @@ -557,6 +572,11 @@ int32 QEVMFetchConstellationTrace(niRFmxInstrHandle instrumentHandle, char selec
return RFmxCDMA2k_QEVMFetchConstellationTrace(instrumentHandle, selectorString, timeout, constellation, arraySize, actualArraySize);
}

int32 QEVMFetchConstellationTraceSplit(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 constellationI[], float32 constellationQ[], int32 arraySize, int32* actualArraySize)
{
return RFmxCDMA2k_QEVMFetchConstellationTraceSplit(instrumentHandle, selectorString, timeout, constellationI, constellationQ, arraySize, actualArraySize);
}

int32 QEVMFetchEVM(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* meanRMSEVM, float64* maximumPeakEVM, float64* meanFrequencyError, float64* meanMagnitudeError, float64* meanPhaseError, float64* meanChipRateError)
{
return RFmxCDMA2k_QEVMFetchEVM(instrumentHandle, selectorString, timeout, meanRMSEVM, maximumPeakEVM, meanFrequencyError, meanMagnitudeError, meanPhaseError, meanChipRateError);
Expand Down
Loading

0 comments on commit 619d182

Please sign in to comment.