Skip to content

Commit

Permalink
Updated gRPC Device code for all 24C1 RFmx APIs (#1047)
Browse files Browse the repository at this point in the history 
* SpecAn 24C1 APIs implementation

* Bumping the version for SpecAn personality to 24.3.0

* Adding LTE List mode APIs and bumping the LTE personality version to 24.3.0

* Adding BT APIs

* Bumping the version to 24.3.0 for NR and generating 24C1 APIs

* Adding WLAN APIs and bumping the version to 24.3.0

---------

Co-authored-by: rnagaraj <rahul.nagaraju@ni.com>
  • Loading branch information
@RahulBenaka @RahulNagaraju15
RahulBenaka and RahulNagaraju15 authored Mar 20, 2024
1 parent b16c773 commit e034b69
Show file tree
Hide file tree
Showing 53 changed files with 4,507 additions and 3,347 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ 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 | 2023 Q1 | Not Supported | Not Supported |
| NI-RFmx NR | 2023 Q3 | Not Supported | Not Supported |
| NI-RFmx SpecAn | 2023 Q4 | Not Supported | Not Supported |
| NI-RFmx LTE | 2024 Q1 | Not Supported | Not Supported |
| NI-RFmx NR | 2024 Q1 | Not Supported | Not Supported |
| NI-RFmx SpecAn | 2024 Q1 | Not Supported | Not Supported |
| NI-RFmx TD-SCDMA | 2023 Q1 | Not Supported | Not Supported |
| NI-RFmx WCDMA | 2023 Q1 | Not Supported | Not Supported |
| NI-RFmx WLAN | 2023 Q3 | Not Supported | Not Supported |
| NI-RFmx WLAN | 2024 Q1 | Not Supported | Not Supported |
| NI-RFSA | 21.0.0 | 21.0.0 | Not Supported |
| NI-RFSG | 21.0.0 | 21.0.0 | Not Supported |
| NI-SCOPE | 2023 Q2 | 2023 Q2 | 2023 Q2 |
Expand Down
20 changes: 20 additions & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ service NiRFmxBluetooth {
rpc ModAccFetchDf1maxTrace(ModAccFetchDf1maxTraceRequest) returns (ModAccFetchDf1maxTraceResponse);
rpc ModAccFetchDf2(ModAccFetchDf2Request) returns (ModAccFetchDf2Response);
rpc ModAccFetchDf2maxTrace(ModAccFetchDf2maxTraceRequest) returns (ModAccFetchDf2maxTraceResponse);
rpc ModAccFetchDf4avgTrace(ModAccFetchDf4avgTraceRequest) returns (ModAccFetchDf4avgTraceResponse);
rpc ModAccFetchFrequencyErrorBR(ModAccFetchFrequencyErrorBRRequest) returns (ModAccFetchFrequencyErrorBRResponse);
rpc ModAccFetchFrequencyErrorEDR(ModAccFetchFrequencyErrorEDRRequest) returns (ModAccFetchFrequencyErrorEDRResponse);
rpc ModAccFetchFrequencyErrorLE(ModAccFetchFrequencyErrorLERequest) returns (ModAccFetchFrequencyErrorLEResponse);
Expand Down Expand Up @@ -190,6 +191,9 @@ enum NiRFmxBluetoothAttribute {
NIRFMXBLUETOOTH_ATTRIBUTE_CHANNEL_SOUNDING_SYNC_SEQUENCE = 11534385;
NIRFMXBLUETOOTH_ATTRIBUTE_CHANNEL_SOUNDING_PHASE_MEASUREMENT_PERIOD = 11534386;
NIRFMXBLUETOOTH_ATTRIBUTE_CHANNEL_SOUNDING_TONE_EXTENSION_SLOT = 11534387;
NIRFMXBLUETOOTH_ATTRIBUTE_BANDWIDTH_BIT_PERIOD_PRODUCT = 11534388;
NIRFMXBLUETOOTH_ATTRIBUTE_CHANNEL_SOUNDING_ANTENNA_SWITCH_TIME = 11534389;
NIRFMXBLUETOOTH_ATTRIBUTE_CHANNEL_SOUNDING_NUMBER_OF_ANTENNA_PATH = 11534390;
NIRFMXBLUETOOTH_ATTRIBUTE_REFERENCE_LEVEL_HEADROOM = 11538428;
NIRFMXBLUETOOTH_ATTRIBUTE_SELECTED_PORTS = 11538429;
NIRFMXBLUETOOTH_ATTRIBUTE_IQ_POWER_EDGE_TRIGGER_LEVEL_TYPE = 11538431;
Expand All @@ -211,6 +215,7 @@ enum NiRFmxBluetoothAttribute {
NIRFMXBLUETOOTH_ATTRIBUTE_TXP_RESULTS_LE_CTE_REFERENCE_PERIOD_PEAK_ABSOLUTE_POWER_DEVIATION_MAXIMUM = 11538453;
NIRFMXBLUETOOTH_ATTRIBUTE_TXP_RESULTS_LE_CTE_TRANSMIT_SLOT_AVERAGE_POWER_MEAN = 11538454;
NIRFMXBLUETOOTH_ATTRIBUTE_TXP_RESULTS_LE_CTE_TRANSMIT_SLOT_PEAK_ABSOLUTE_POWER_DEVIATION_MAXIMUM = 11538455;
NIRFMXBLUETOOTH_ATTRIBUTE_TXP_RESULTS_LE_CS_PHASE_MEASUREMENT_PERIOD_AVERAGE_POWER_MEAN = 11538456;
NIRFMXBLUETOOTH_ATTRIBUTE_TWENTY_DB_BANDWIDTH_MEASUREMENT_ENABLED = 11542528;
NIRFMXBLUETOOTH_ATTRIBUTE_TWENTY_DB_BANDWIDTH_AVERAGING_ENABLED = 11542530;
NIRFMXBLUETOOTH_ATTRIBUTE_TWENTY_DB_BANDWIDTH_AVERAGING_COUNT = 11542531;
Expand Down Expand Up @@ -270,6 +275,8 @@ enum NiRFmxBluetoothAttribute {
NIRFMXBLUETOOTH_ATTRIBUTE_MODACC_RESULTS_LE_INITIAL_FREQUENCY_ERROR_MAXIMUM = 11550769;
NIRFMXBLUETOOTH_ATTRIBUTE_MODACC_RESULTS_CLOCK_DRIFT_MEAN = 11550770;
NIRFMXBLUETOOTH_ATTRIBUTE_MODACC_RESULTS_PREAMBLE_START_TIME_MEAN = 11550771;
NIRFMXBLUETOOTH_ATTRIBUTE_MODACC_RESULTS_DF3AVG_MEAN = 11550772;
NIRFMXBLUETOOTH_ATTRIBUTE_MODACC_RESULTS_PERCENTAGE_OF_SYMBOLS_ABOVE_DF4AVG_THRESHOLD = 11550773;
NIRFMXBLUETOOTH_ATTRIBUTE_ACP_MEASUREMENT_ENABLED = 11554816;
NIRFMXBLUETOOTH_ATTRIBUTE_ACP_OFFSET_CHANNEL_MODE = 11554818;
NIRFMXBLUETOOTH_ATTRIBUTE_ACP_NUMBER_OF_OFFSETS = 11554819;
Expand Down Expand Up @@ -1660,6 +1667,19 @@ message ModAccFetchDf2maxTraceResponse {
int32 actual_array_size = 4;
}

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

message ModAccFetchDf4avgTraceResponse {
int32 status = 1;
repeated float time = 2;
repeated float df4avg = 3;
int32 actual_array_size = 4;
}

message ModAccFetchFrequencyErrorBRRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
Expand Down
19 changes: 19 additions & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,25 @@ mod_acc_fetch_df2max_trace(const StubPtr& stub, const nidevice_grpc::Session& in
return response;
}

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

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

auto response = ModAccFetchDf4avgTraceResponse{};

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

return response;
}

ModAccFetchFrequencyErrorBRResponse
mod_acc_fetch_frequency_error_br(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout)
{
Expand Down
1 change: 1 addition & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ ModAccFetchDf1Response mod_acc_fetch_df1(const StubPtr& stub, const nidevice_grp
ModAccFetchDf1maxTraceResponse mod_acc_fetch_df1max_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchDf2Response mod_acc_fetch_df2(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchDf2maxTraceResponse mod_acc_fetch_df2max_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchDf4avgTraceResponse mod_acc_fetch_df4avg_trace(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchFrequencyErrorBRResponse mod_acc_fetch_frequency_error_br(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchFrequencyErrorEDRResponse mod_acc_fetch_frequency_error_edr(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
ModAccFetchFrequencyErrorLEResponse mod_acc_fetch_frequency_error_le(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& timeout);
Expand Down
5 changes: 5 additions & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_compilation_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,11 @@ int32 ModAccFetchDf2maxTrace(niRFmxInstrHandle instrumentHandle, char selectorSt
return RFmxBT_ModAccFetchDf2maxTrace(instrumentHandle, selectorString, timeout, time, df2max, arraySize, actualArraySize);
}

int32 ModAccFetchDf4avgTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df4avg[], int32 arraySize, int32* actualArraySize)
{
return RFmxBT_ModAccFetchDf4avgTrace(instrumentHandle, selectorString, timeout, time, df4avg, arraySize, actualArraySize);
}

int32 ModAccFetchFrequencyErrorBR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* initialFrequencyErrorMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum)
{
return RFmxBT_ModAccFetchFrequencyErrorBR(instrumentHandle, selectorString, timeout, initialFrequencyErrorMaximum, peakFrequencyDriftMaximum, peakFrequencyDriftRateMaximum);
Expand Down
9 changes: 9 additions & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_library.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ NiRFmxBluetoothLibrary::NiRFmxBluetoothLibrary(std::shared_ptr<nidevice_grpc::Sh
function_pointers_.ModAccFetchDf1maxTrace = reinterpret_cast<ModAccFetchDf1maxTracePtr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchDf1maxTrace"));
function_pointers_.ModAccFetchDf2 = reinterpret_cast<ModAccFetchDf2Ptr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchDf2"));
function_pointers_.ModAccFetchDf2maxTrace = reinterpret_cast<ModAccFetchDf2maxTracePtr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchDf2maxTrace"));
function_pointers_.ModAccFetchDf4avgTrace = reinterpret_cast<ModAccFetchDf4avgTracePtr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchDf4avgTrace"));
function_pointers_.ModAccFetchFrequencyErrorBR = reinterpret_cast<ModAccFetchFrequencyErrorBRPtr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchFrequencyErrorBR"));
function_pointers_.ModAccFetchFrequencyErrorEDR = reinterpret_cast<ModAccFetchFrequencyErrorEDRPtr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchFrequencyErrorEDR"));
function_pointers_.ModAccFetchFrequencyErrorLE = reinterpret_cast<ModAccFetchFrequencyErrorLEPtr>(shared_library_->get_function_pointer("RFmxBT_ModAccFetchFrequencyErrorLE"));
Expand Down Expand Up @@ -882,6 +883,14 @@ int32 NiRFmxBluetoothLibrary::ModAccFetchDf2maxTrace(niRFmxInstrHandle instrumen
return function_pointers_.ModAccFetchDf2maxTrace(instrumentHandle, selectorString, timeout, time, df2max, arraySize, actualArraySize);
}

int32 NiRFmxBluetoothLibrary::ModAccFetchDf4avgTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df4avg[], int32 arraySize, int32* actualArraySize)
{
if (!function_pointers_.ModAccFetchDf4avgTrace) {
throw nidevice_grpc::LibraryLoadException("Could not find RFmxBT_ModAccFetchDf4avgTrace.");
}
return function_pointers_.ModAccFetchDf4avgTrace(instrumentHandle, selectorString, timeout, time, df4avg, arraySize, actualArraySize);
}

int32 NiRFmxBluetoothLibrary::ModAccFetchFrequencyErrorBR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* initialFrequencyErrorMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum)
{
if (!function_pointers_.ModAccFetchFrequencyErrorBR) {
Expand Down
3 changes: 3 additions & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_library.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ class NiRFmxBluetoothLibrary : public nirfmxbluetooth_grpc::NiRFmxBluetoothLibra
int32 ModAccFetchDf1maxTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df1max[], int32 arraySize, int32* actualArraySize) override;
int32 ModAccFetchDf2(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* df2avgMinimum, float64* percentageOfSymbolsAboveDf2maxThreshold) override;
int32 ModAccFetchDf2maxTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df2max[], int32 arraySize, int32* actualArraySize) override;
int32 ModAccFetchDf4avgTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df4avg[], int32 arraySize, int32* actualArraySize) override;
int32 ModAccFetchFrequencyErrorBR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* initialFrequencyErrorMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum) override;
int32 ModAccFetchFrequencyErrorEDR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* headerFrequencyErrorWiMaximum, float64* peakFrequencyErrorWiPlusW0Maximum, float64* peakFrequencyErrorW0Maximum) override;
int32 ModAccFetchFrequencyErrorLE(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* peakFrequencyErrorMaximum, float64* initialFrequencyDriftMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum) override;
Expand Down Expand Up @@ -249,6 +250,7 @@ class NiRFmxBluetoothLibrary : public nirfmxbluetooth_grpc::NiRFmxBluetoothLibra
using ModAccFetchDf1maxTracePtr = decltype(&RFmxBT_ModAccFetchDf1maxTrace);
using ModAccFetchDf2Ptr = decltype(&RFmxBT_ModAccFetchDf2);
using ModAccFetchDf2maxTracePtr = decltype(&RFmxBT_ModAccFetchDf2maxTrace);
using ModAccFetchDf4avgTracePtr = decltype(&RFmxBT_ModAccFetchDf4avgTrace);
using ModAccFetchFrequencyErrorBRPtr = decltype(&RFmxBT_ModAccFetchFrequencyErrorBR);
using ModAccFetchFrequencyErrorEDRPtr = decltype(&RFmxBT_ModAccFetchFrequencyErrorEDR);
using ModAccFetchFrequencyErrorLEPtr = decltype(&RFmxBT_ModAccFetchFrequencyErrorLE);
Expand Down Expand Up @@ -389,6 +391,7 @@ class NiRFmxBluetoothLibrary : public nirfmxbluetooth_grpc::NiRFmxBluetoothLibra
ModAccFetchDf1maxTracePtr ModAccFetchDf1maxTrace;
ModAccFetchDf2Ptr ModAccFetchDf2;
ModAccFetchDf2maxTracePtr ModAccFetchDf2maxTrace;
ModAccFetchDf4avgTracePtr ModAccFetchDf4avgTrace;
ModAccFetchFrequencyErrorBRPtr ModAccFetchFrequencyErrorBR;
ModAccFetchFrequencyErrorEDRPtr ModAccFetchFrequencyErrorEDR;
ModAccFetchFrequencyErrorLEPtr ModAccFetchFrequencyErrorLE;
Expand Down
1 change: 1 addition & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_library_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ class NiRFmxBluetoothLibraryInterface {
virtual int32 ModAccFetchDf1maxTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df1max[], int32 arraySize, int32* actualArraySize) = 0;
virtual int32 ModAccFetchDf2(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* df2avgMinimum, float64* percentageOfSymbolsAboveDf2maxThreshold) = 0;
virtual int32 ModAccFetchDf2maxTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df2max[], int32 arraySize, int32* actualArraySize) = 0;
virtual int32 ModAccFetchDf4avgTrace(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df4avg[], int32 arraySize, int32* actualArraySize) = 0;
virtual int32 ModAccFetchFrequencyErrorBR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* initialFrequencyErrorMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum) = 0;
virtual int32 ModAccFetchFrequencyErrorEDR(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* headerFrequencyErrorWiMaximum, float64* peakFrequencyErrorWiPlusW0Maximum, float64* peakFrequencyErrorW0Maximum) = 0;
virtual int32 ModAccFetchFrequencyErrorLE(niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* peakFrequencyErrorMaximum, float64* initialFrequencyDriftMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum) = 0;
Expand Down
1 change: 1 addition & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_mock_library.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class NiRFmxBluetoothMockLibrary : public nirfmxbluetooth_grpc::NiRFmxBluetoothL
MOCK_METHOD(int32, ModAccFetchDf1maxTrace, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df1max[], int32 arraySize, int32* actualArraySize), (override));
MOCK_METHOD(int32, ModAccFetchDf2, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* df2avgMinimum, float64* percentageOfSymbolsAboveDf2maxThreshold), (override));
MOCK_METHOD(int32, ModAccFetchDf2maxTrace, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df2max[], int32 arraySize, int32* actualArraySize), (override));
MOCK_METHOD(int32, ModAccFetchDf4avgTrace, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float32 time[], float32 df4avg[], int32 arraySize, int32* actualArraySize), (override));
MOCK_METHOD(int32, ModAccFetchFrequencyErrorBR, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* initialFrequencyErrorMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum), (override));
MOCK_METHOD(int32, ModAccFetchFrequencyErrorEDR, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* headerFrequencyErrorWiMaximum, float64* peakFrequencyErrorWiPlusW0Maximum, float64* peakFrequencyErrorW0Maximum), (override));
MOCK_METHOD(int32, ModAccFetchFrequencyErrorLE, (niRFmxInstrHandle instrumentHandle, char selectorString[], float64 timeout, float64* peakFrequencyErrorMaximum, float64* initialFrequencyDriftMaximum, float64* peakFrequencyDriftMaximum, float64* peakFrequencyDriftRateMaximum), (override));
Expand Down
44 changes: 44 additions & 0 deletions generated/nirfmxbluetooth/nirfmxbluetooth_service.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3236,6 +3236,50 @@ namespace nirfmxbluetooth_grpc {
}
}

//---------------------------------------------------------------------
//---------------------------------------------------------------------
::grpc::Status NiRFmxBluetoothService::ModAccFetchDf4avgTrace(::grpc::ServerContext* context, const ModAccFetchDf4avgTraceRequest* request, ModAccFetchDf4avgTraceResponse* response)
{
if (context->IsCancelled()) {
return ::grpc::Status::CANCELLED;
}
try {
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();
float64 timeout = request->timeout();
int32 actual_array_size {};
while (true) {
auto status = library_->ModAccFetchDf4avgTrace(instrument, selector_string, timeout, nullptr, nullptr, 0, &actual_array_size);
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->mutable_time()->Resize(actual_array_size, 0);
float32* time = response->mutable_time()->mutable_data();
response->mutable_df4avg()->Resize(actual_array_size, 0);
float32* df4avg = response->mutable_df4avg()->mutable_data();
auto array_size = actual_array_size;
status = library_->ModAccFetchDf4avgTrace(instrument, selector_string, timeout, time, df4avg, array_size, &actual_array_size);
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer) {
// buffer is now too small, try again
continue;
}
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
response->mutable_time()->Resize(actual_array_size, 0);
response->mutable_df4avg()->Resize(actual_array_size, 0);
response->set_actual_array_size(actual_array_size);
return ::grpc::Status::OK;
}
}
catch (nidevice_grpc::NonDriverException& ex) {
return ex.GetStatus();
}
}

//---------------------------------------------------------------------
//---------------------------------------------------------------------
::grpc::Status NiRFmxBluetoothService::ModAccFetchFrequencyErrorBR(::grpc::ServerContext* context, const ModAccFetchFrequencyErrorBRRequest* request, ModAccFetchFrequencyErrorBRResponse* response)
Expand Down
Loading

0 comments on commit e034b69

Please sign in to comment.