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

Adding 24C4 LTE and Instr APIs #1139

Merged
merged 4 commits into from
Dec 11, 2024
Merged

Adding 24C4 LTE and Instr APIs #1139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8610bb2
LTE gRPC Code
RahulNagaraju15 Dec 4, 2024
b8c901d
Instr changes
RahulNagaraju15 Dec 10, 2024
d276d4f
Updating version to 25.0.0
RahulNagaraju15 Dec 11, 2024
ccb8ca0
LTE Proto file generation
RahulNagaraju15 Dec 11, 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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Indicates the most recent driver version used to test builds of the current sour
| NI-RFmx CDMA2k | 2023 Q1 | Not Supported | Not Supported |
| NI-RFmx Demod | 2023 Q1 | Not Supported | Not Supported |
| NI-RFmx GSM | 2023 Q1 | Not Supported | Not Supported |
| NI-RFmx LTE | 2024 Q3 | Not Supported | Not Supported |
| 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 |
Expand Down
5 changes: 4 additions & 1 deletion generated/nirfmxinstr/nirfmxinstr.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-RFMXINSTR API metadata version 24.3.0
// This file is generated from NI-RFMXINSTR API metadata version 25.0.0
//---------------------------------------------------------------------
// Proto file for the NI-RFMXINSTR Metadata
//---------------------------------------------------------------------
Expand Down Expand Up @@ -216,6 +216,8 @@ enum NiRFmxInstrAttribute {
NIRFMXINSTR_ATTRIBUTE_THERMAL_CORRECTION_TEMPERATURE_RESOLUTION = 120;
NIRFMXINSTR_ATTRIBUTE_NUMBER_OF_RAW_IQ_RECORDS = 128;
NIRFMXINSTR_ATTRIBUTE_LOAD_OPTIONS = 163;
NIRFMXINSTR_ATTRIBUTE_LO_SPLITTER_LOSS_FREQUENCY = 184;
NIRFMXINSTR_ATTRIBUTE_LO_SPLITTER_LOSS = 185;
}

enum ExportSignalSource {
Expand Down Expand Up @@ -400,6 +402,7 @@ enum NiRFmxInstrInt32AttributeValues {
NIRFMXINSTR_INT32_LO_SHARING_MODE_DISABLED = 0;
NIRFMXINSTR_INT32_LO_SHARING_MODE_EXTERNAL_DAISY_CHAIN = 4;
NIRFMXINSTR_INT32_LO_SHARING_MODE_EXTERNAL_STAR = 3;
NIRFMXINSTR_INT32_LO_SHARING_MODE_SPLITTER_AND_DAISY_CHAIN = 5;
NIRFMXINSTR_INT32_LOAD_OPTIONS_SKIP_NONE = 0;
NIRFMXINSTR_INT32_LOAD_OPTIONS_SKIP_RFINSTR = 1;
NIRFMXINSTR_INT32_MECHANICAL_ATTENUATION_AUTO_FALSE = 0;
Expand Down
103 changes: 102 additions & 1 deletion generated/nirfmxlte/nirfmxlte.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-RFMXLTE API metadata version 24.8.0
// This file is generated from NI-RFMXLTE API metadata version 25.0.0
//---------------------------------------------------------------------
// Proto file for the NI-RFMXLTE Metadata
//---------------------------------------------------------------------
Expand Down Expand Up @@ -196,11 +196,17 @@ service NiRFmxLTE {
rpc ModAccFetchMaximumFrequencyErrorPerSlotTrace(ModAccFetchMaximumFrequencyErrorPerSlotTraceRequest) returns (ModAccFetchMaximumFrequencyErrorPerSlotTraceResponse);
rpc ModAccFetchMaximumMagnitudeErrorPerSymbolTrace(ModAccFetchMaximumMagnitudeErrorPerSymbolTraceRequest) returns (ModAccFetchMaximumMagnitudeErrorPerSymbolTraceResponse);
rpc ModAccFetchMaximumPhaseErrorPerSymbolTrace(ModAccFetchMaximumPhaseErrorPerSymbolTraceRequest) returns (ModAccFetchMaximumPhaseErrorPerSymbolTraceResponse);
rpc ModAccFetchNBSynchronizationSignalConstellation(ModAccFetchNBSynchronizationSignalConstellationRequest) returns (ModAccFetchNBSynchronizationSignalConstellationResponse);
rpc ModAccFetchNBSynchronizationSignalConstellationSplit(ModAccFetchNBSynchronizationSignalConstellationSplitRequest) returns (ModAccFetchNBSynchronizationSignalConstellationSplitResponse);
rpc ModAccFetchNPDSCHQPSKConstellation(ModAccFetchNPDSCHQPSKConstellationRequest) returns (ModAccFetchNPDSCHQPSKConstellationResponse);
rpc ModAccFetchNPDSCHQPSKConstellationSplit(ModAccFetchNPDSCHQPSKConstellationSplitRequest) returns (ModAccFetchNPDSCHQPSKConstellationSplitResponse);
rpc ModAccFetchNPUSCHConstellationTrace(ModAccFetchNPUSCHConstellationTraceRequest) returns (ModAccFetchNPUSCHConstellationTraceResponse);
rpc ModAccFetchNPUSCHConstellationTraceSplit(ModAccFetchNPUSCHConstellationTraceSplitRequest) returns (ModAccFetchNPUSCHConstellationTraceSplitResponse);
rpc ModAccFetchNPUSCHDMRSEVM(ModAccFetchNPUSCHDMRSEVMRequest) returns (ModAccFetchNPUSCHDMRSEVMResponse);
rpc ModAccFetchNPUSCHDataEVM(ModAccFetchNPUSCHDataEVMRequest) returns (ModAccFetchNPUSCHDataEVMResponse);
rpc ModAccFetchNPUSCHSymbolPower(ModAccFetchNPUSCHSymbolPowerRequest) returns (ModAccFetchNPUSCHSymbolPowerResponse);
rpc ModAccFetchNRSConstellation(ModAccFetchNRSConstellationRequest) returns (ModAccFetchNRSConstellationResponse);
rpc ModAccFetchNRSConstellationSplit(ModAccFetchNRSConstellationSplitRequest) returns (ModAccFetchNRSConstellationSplitResponse);
rpc ModAccFetchPDSCH1024QAMConstellation(ModAccFetchPDSCH1024QAMConstellationRequest) returns (ModAccFetchPDSCH1024QAMConstellationResponse);
rpc ModAccFetchPDSCH1024QAMConstellationSplit(ModAccFetchPDSCH1024QAMConstellationSplitRequest) returns (ModAccFetchPDSCH1024QAMConstellationSplitResponse);
rpc ModAccFetchPDSCH1024QAMEVM(ModAccFetchPDSCH1024QAMEVMRequest) returns (ModAccFetchPDSCH1024QAMEVMResponse);
Expand Down Expand Up @@ -607,6 +613,17 @@ enum NiRFmxLTEAttribute {
NIRFMXLTE_ATTRIBUTE_MODACC_TIMING_TRACKING_ENABLED = 3162241;
NIRFMXLTE_ATTRIBUTE_MODACC_PHASE_TRACKING_ENABLED = 3162242;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_MAXIMUM_PEAK_FREQUENCY_ERROR = 3162243;
NIRFMXLTE_ATTRIBUTE_NB_IOT_DOWNLINK_CHANNEL_CONFIGURATION_MODE = 3162244;
NIRFMXLTE_ATTRIBUTE_NPSS_POWER = 3162247;
NIRFMXLTE_ATTRIBUTE_NSSS_POWER = 3162249;
NIRFMXLTE_ATTRIBUTE_NPDSCH_POWER = 3162250;
NIRFMXLTE_ATTRIBUTE_NPDSCH_ENABLED = 3162251;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_MEAN_RMS_NPSS_EVM = 3162254;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_MEAN_RMS_NSSS_EVM = 3162255;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_NPDSCH_MEAN_RMS_EVM = 3162256;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_NPDSCH_MEAN_RMS_QPSK_EVM = 3162257;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_MEAN_RMS_NRS_EVM = 3162259;
NIRFMXLTE_ATTRIBUTE_MODACC_RESULTS_DOWNLINK_NRS_TRANSMIT_POWER = 3162260;
NIRFMXLTE_ATTRIBUTE_OBW_MEASUREMENT_ENABLED = 3170304;
NIRFMXLTE_ATTRIBUTE_OBW_NUMBER_OF_ANALYSIS_THREADS = 3170307;
NIRFMXLTE_ATTRIBUTE_OBW_SPAN = 3170308;
Expand Down Expand Up @@ -1419,6 +1436,8 @@ enum NiRFmxLTEInt32AttributeValues {
NIRFMXLTE_INT32_MODACC_SYNCHRONIZATION_MODE_MARKER = 2;
NIRFMXLTE_INT32_MODACC_TIMING_TRACKING_ENABLED_FALSE = 0;
NIRFMXLTE_INT32_MODACC_TIMING_TRACKING_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_NB_IOT_DOWNLINK_CHANNEL_CONFIGURATION_MODE_USER_DEFINED = 1;
NIRFMXLTE_INT32_NB_IOT_DOWNLINK_CHANNEL_CONFIGURATION_MODE_TEST_MODEL = 2;
NIRFMXLTE_INT32_NB_IOT_UPLINK_SUBCARRIER_SPACING_15KHZ = 0;
NIRFMXLTE_INT32_NB_IOT_UPLINK_SUBCARRIER_SPACING_3_75KHZ = 1;
NIRFMXLTE_INT32_NPUSCH_DMRS_BASE_SEQUENCE_MODE_MANUAL = 0;
Expand All @@ -1427,6 +1446,8 @@ enum NiRFmxLTEInt32AttributeValues {
NIRFMXLTE_INT32_NPUSCH_DMRS_GROUP_HOPPING_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_NPUSCH_MODULATION_TYPE_BPSK = 0;
NIRFMXLTE_INT32_NPUSCH_MODULATION_TYPE_QPSK = 1;
NIRFMXLTE_INT32_NPDSCH_ENABLED_FALSE = 0;
NIRFMXLTE_INT32_NPDSCH_ENABLED_TRUE = 1;
NIRFMXLTE_INT32_OBW_AMPLITUDE_CORRECTION_TYPE_RF_CENTER_FREQUENCY = 0;
NIRFMXLTE_INT32_OBW_AMPLITUDE_CORRECTION_TYPE_SPECTRUM_FREQUENCY_BIN = 1;
NIRFMXLTE_INT32_OBW_AVERAGING_ENABLED_FALSE = 0;
Expand Down Expand Up @@ -3796,6 +3817,61 @@ message ModAccFetchMaximumPhaseErrorPerSymbolTraceResponse {
int32 actual_array_size = 5;
}

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

message ModAccFetchNBSynchronizationSignalConstellationResponse {
int32 status = 1;
repeated nidevice_grpc.NIComplexNumberF32 nsss_constellation = 2;
int32 nsss_constellation_actual_array_size = 3;
repeated nidevice_grpc.NIComplexNumberF32 npss_constellation = 4;
int32 npss_constellation_actual_array_size = 5;
}

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

message ModAccFetchNBSynchronizationSignalConstellationSplitResponse {
int32 status = 1;
repeated float nsss_constellation_i = 2;
repeated float nsss_constellation_q = 3;
int32 nsss_constellation_actual_array_size = 4;
repeated float npss_constellation_i = 5;
repeated float npss_constellation_q = 6;
int32 npss_constellation_actual_array_size = 7;
}

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

message ModAccFetchNPDSCHQPSKConstellationResponse {
int32 status = 1;
repeated nidevice_grpc.NIComplexNumberF32 qpsk_constellation = 2;
int32 actual_array_size = 3;
}

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

message ModAccFetchNPDSCHQPSKConstellationSplitResponse {
int32 status = 1;
repeated float qpsk_constellation_i = 2;
repeated float qpsk_constellation_q = 3;
int32 actual_array_size = 4;
}

message ModAccFetchNPUSCHConstellationTraceRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down Expand Up @@ -3862,6 +3938,31 @@ message ModAccFetchNPUSCHSymbolPowerResponse {
double npusch_mean_dmrs_power = 3;
}

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

message ModAccFetchNRSConstellationResponse {
int32 status = 1;
repeated nidevice_grpc.NIComplexNumberF32 nrs_constellation = 2;
int32 actual_array_size = 3;
}

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

message ModAccFetchNRSConstellationSplitResponse {
int32 status = 1;
repeated float nrs_constellation_i = 2;
repeated float nrs_constellation_q = 3;
int32 actual_array_size = 4;
}

message ModAccFetchPDSCH1024QAMConstellationRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down
114 changes: 114 additions & 0 deletions generated/nirfmxlte/nirfmxlte_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3847,6 +3847,82 @@ mod_acc_fetch_maximum_phase_error_per_symbol_trace(const StubPtr& stub, const ni
return response;
}

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

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

auto response = ModAccFetchNBSynchronizationSignalConstellationResponse{};

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

return response;
}

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

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

auto response = ModAccFetchNBSynchronizationSignalConstellationSplitResponse{};

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

return response;
}

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

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

auto response = ModAccFetchNPDSCHQPSKConstellationResponse{};

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

return response;
}

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

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

auto response = ModAccFetchNPDSCHQPSKConstellationSplitResponse{};

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

return response;
}

ModAccFetchNPUSCHConstellationTraceResponse
mod_acc_fetch_npusch_constellation_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down Expand Up @@ -3942,6 +4018,44 @@ mod_acc_fetch_npusch_symbol_power(const StubPtr& stub, const nidevice_grpc::Sess
return response;
}

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

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

auto response = ModAccFetchNRSConstellationResponse{};

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

return response;
}

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

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

auto response = ModAccFetchNRSConstellationSplitResponse{};

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

return response;
}

ModAccFetchPDSCH1024QAMConstellationResponse
mod_acc_fetch_pdsch1024q_am_constellation(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down
6 changes: 6 additions & 0 deletions generated/nirfmxlte/nirfmxlte_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,17 @@ ModAccFetchMaximumEVMPerSymbolTraceResponse mod_acc_fetch_maximum_evm_per_symbol
ModAccFetchMaximumFrequencyErrorPerSlotTraceResponse mod_acc_fetch_maximum_frequency_error_per_slot_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchMaximumMagnitudeErrorPerSymbolTraceResponse mod_acc_fetch_maximum_magnitude_error_per_symbol_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchMaximumPhaseErrorPerSymbolTraceResponse mod_acc_fetch_maximum_phase_error_per_symbol_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNBSynchronizationSignalConstellationResponse mod_acc_fetch_nb_synchronization_signal_constellation(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNBSynchronizationSignalConstellationSplitResponse mod_acc_fetch_nb_synchronization_signal_constellation_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPDSCHQPSKConstellationResponse mod_acc_fetch_npdschqpsk_constellation(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPDSCHQPSKConstellationSplitResponse mod_acc_fetch_npdschqpsk_constellation_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPUSCHConstellationTraceResponse mod_acc_fetch_npusch_constellation_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPUSCHConstellationTraceSplitResponse mod_acc_fetch_npusch_constellation_trace_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPUSCHDMRSEVMResponse mod_acc_fetch_npuschdmrsevm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPUSCHDataEVMResponse mod_acc_fetch_npusch_data_evm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNPUSCHSymbolPowerResponse mod_acc_fetch_npusch_symbol_power(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNRSConstellationResponse mod_acc_fetch_nrs_constellation(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchNRSConstellationSplitResponse mod_acc_fetch_nrs_constellation_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchPDSCH1024QAMConstellationResponse mod_acc_fetch_pdsch1024q_am_constellation(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchPDSCH1024QAMConstellationSplitResponse mod_acc_fetch_pdsch1024q_am_constellation_split(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchPDSCH1024QAMEVMResponse mod_acc_fetch_pdsch1024q_amevm(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
Expand Down
Loading
Loading