Skip to content

Updating param name from connector_i_ds to connector_ids in RFmx VNA #1237

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

Merged
RahulBenaka merged 2 commits into from
Feb 26, 2026
Merged

Updating param name from connector_i_ds to connector_ids in RFmx VNA #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34248ee
Fixing "i_ds" to "_ids" using ADDITIONAL_ACRONYM mechanism
RahulNagaraju15 Feb 19, 2026
bc3cfaf
Adding ^current_latest_version for setuptools and running poetry lock
RahulNagaraju15 Feb 25, 2026
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
539 changes: 302 additions & 237 deletions examples/poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions examples/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mypy-protobuf = "3.6.0"
types-protobuf = ">=5.28.3.20241203"
types-grpcio = ">=1.0"
black = ">=23.3.0"
setuptools = "^80.9.0"

[[tool.mypy.overrides]]
# nifpga has a field named "property" which shadows the built-in "@property" decorator.
Expand Down
10 changes: 5 additions & 5 deletions generated/nirfmxvna/nirfmxvna.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,7 @@ message CalkitManagerCalkitCalibrationElementGetPortConnectorsRequest {

message CalkitManagerCalkitCalibrationElementGetPortConnectorsResponse {
int32 status = 1;
string connector_i_ds = 2;
string connector_ids = 2;
}

message CalkitManagerCalkitCalibrationElementGetSParameterDefinitionRequest {
Expand Down Expand Up @@ -1413,7 +1413,7 @@ message CalkitManagerCalkitCalibrationElementSetMinimumFrequencyResponse {
message CalkitManagerCalkitCalibrationElementSetPortConnectorsRequest {
nidevice_grpc.Session instrument = 1;
string selector_string = 2;
string connector_i_ds = 3;
string connector_ids = 3;
int32 array_size = 4;
}

Expand Down Expand Up @@ -1575,7 +1575,7 @@ message CalkitManagerCalkitGetCalibrationElementIDsRequest {

message CalkitManagerCalkitGetCalibrationElementIDsResponse {
int32 status = 1;
string calibration_element_i_ds = 2;
string calibration_element_ids = 2;
}

message CalkitManagerCalkitGetConnectorIDsRequest {
Expand All @@ -1585,7 +1585,7 @@ message CalkitManagerCalkitGetConnectorIDsRequest {

message CalkitManagerCalkitGetConnectorIDsResponse {
int32 status = 1;
string connector_i_ds = 2;
string connector_ids = 2;
}

message CalkitManagerCalkitGetDescriptionRequest {
Expand Down Expand Up @@ -1720,7 +1720,7 @@ message CalkitManagerGetCalkitIDsRequest {

message CalkitManagerGetCalkitIDsResponse {
int32 status = 1;
string calkit_i_ds = 2;
string calkit_ids = 2;
}

message CalkitManagerImportCalkitRequest {
Expand Down
4 changes: 2 additions & 2 deletions generated/nirfmxvna/nirfmxvna_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,14 +1342,14 @@ calkit_manager_calkit_calibration_element_set_minimum_frequency(const StubPtr& s
}

CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse
calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_i_ds, const pb::int32& array_size)
calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_ids, const pb::int32& array_size)
{
::grpc::ClientContext context;

auto request = CalkitManagerCalkitCalibrationElementSetPortConnectorsRequest{};
request.mutable_instrument()->CopyFrom(instrument);
request.set_selector_string(selector_string);
request.set_connector_i_ds(connector_i_ds);
request.set_connector_ids(connector_ids);
request.set_array_size(array_size);

auto response = CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse{};
Expand Down
2 changes: 1 addition & 1 deletion generated/nirfmxvna/nirfmxvna_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ CalkitManagerCalkitCalibrationElementSParameterSetSParamAvailabilityResponse cal
CalkitManagerCalkitCalibrationElementSetDescriptionResponse calkit_manager_calkit_calibration_element_set_description(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& description);
CalkitManagerCalkitCalibrationElementSetMaximumFrequencyResponse calkit_manager_calkit_calibration_element_set_maximum_frequency(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& maximum_frequency);
CalkitManagerCalkitCalibrationElementSetMinimumFrequencyResponse calkit_manager_calkit_calibration_element_set_minimum_frequency(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const double& minimum_frequency);
CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_i_ds, const pb::int32& array_size);
CalkitManagerCalkitCalibrationElementSetPortConnectorsResponse calkit_manager_calkit_calibration_element_set_port_connectors(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::string& connector_ids, const pb::int32& array_size);
CalkitManagerCalkitCalibrationElementSetSParameterDefinitionResponse calkit_manager_calkit_calibration_element_set_s_parameter_definition(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const simple_variant<CalkitManagerCalkitCalibrationElementSParameterDefinition, pb::int32>& s_parameter_definition);
CalkitManagerCalkitCalibrationElementSetTypesResponse calkit_manager_calkit_calibration_element_set_types(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string, const std::vector<pb::int32>& calibration_element_types);
CalkitManagerCalkitConnectorGetDescriptionResponse calkit_manager_calkit_connector_get_description(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string);
Expand Down
62 changes: 31 additions & 31 deletions generated/nirfmxvna/nirfmxvna_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,11 +902,11 @@ namespace nirfmxvna_grpc {
}
int32 array_size = status;

std::string connector_i_ds;
std::string connector_ids;
if (array_size > 0) {
connector_i_ds.resize(array_size - 1);
connector_ids.resize(array_size - 1);
}
status = library_->CalkitManagerCalkitCalibrationElementGetPortConnectors(instrument, selector_string, array_size, (char*)connector_i_ds.data());
status = library_->CalkitManagerCalkitCalibrationElementGetPortConnectors(instrument, selector_string, array_size, (char*)connector_ids.data());
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
// buffer is now too small, try again
continue;
Expand All @@ -915,10 +915,10 @@ namespace nirfmxvna_grpc {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
std::string connector_i_ds_utf8;
convert_to_grpc(connector_i_ds, &connector_i_ds_utf8);
response->set_connector_i_ds(connector_i_ds_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_i_ds()));
std::string connector_ids_utf8;
convert_to_grpc(connector_ids, &connector_ids_utf8);
response->set_connector_ids(connector_ids_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_ids()));
return ::grpc::Status::OK;
}
}
Expand Down Expand Up @@ -2412,10 +2412,10 @@ namespace nirfmxvna_grpc {
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 connector_i_ds_mbcs = convert_from_grpc<std::string>(request->connector_i_ds());
char* connector_i_ds = (char*)connector_i_ds_mbcs.c_str();
auto connector_ids_mbcs = convert_from_grpc<std::string>(request->connector_ids());
char* connector_ids = (char*)connector_ids_mbcs.c_str();
int32 array_size = request->array_size();
auto status = library_->CalkitManagerCalkitCalibrationElementSetPortConnectors(instrument, selector_string, connector_i_ds, array_size);
auto status = library_->CalkitManagerCalkitCalibrationElementSetPortConnectors(instrument, selector_string, connector_ids, array_size);
if (!status_ok(status)) {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
Expand Down Expand Up @@ -2883,11 +2883,11 @@ namespace nirfmxvna_grpc {
}
int32 array_size = status;

std::string calibration_element_i_ds;
std::string calibration_element_ids;
if (array_size > 0) {
calibration_element_i_ds.resize(array_size - 1);
calibration_element_ids.resize(array_size - 1);
}
status = library_->CalkitManagerCalkitGetCalibrationElementIDs(instrument, selector_string, array_size, (char*)calibration_element_i_ds.data());
status = library_->CalkitManagerCalkitGetCalibrationElementIDs(instrument, selector_string, array_size, (char*)calibration_element_ids.data());
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
// buffer is now too small, try again
continue;
Expand All @@ -2896,10 +2896,10 @@ namespace nirfmxvna_grpc {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
std::string calibration_element_i_ds_utf8;
convert_to_grpc(calibration_element_i_ds, &calibration_element_i_ds_utf8);
response->set_calibration_element_i_ds(calibration_element_i_ds_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calibration_element_i_ds()));
std::string calibration_element_ids_utf8;
convert_to_grpc(calibration_element_ids, &calibration_element_ids_utf8);
response->set_calibration_element_ids(calibration_element_ids_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calibration_element_ids()));
return ::grpc::Status::OK;
}
}
Expand Down Expand Up @@ -2928,11 +2928,11 @@ namespace nirfmxvna_grpc {
}
int32 array_size = status;

std::string connector_i_ds;
std::string connector_ids;
if (array_size > 0) {
connector_i_ds.resize(array_size - 1);
connector_ids.resize(array_size - 1);
}
status = library_->CalkitManagerCalkitGetConnectorIDs(instrument, selector_string, array_size, (char*)connector_i_ds.data());
status = library_->CalkitManagerCalkitGetConnectorIDs(instrument, selector_string, array_size, (char*)connector_ids.data());
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
// buffer is now too small, try again
continue;
Expand All @@ -2941,10 +2941,10 @@ namespace nirfmxvna_grpc {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
std::string connector_i_ds_utf8;
convert_to_grpc(connector_i_ds, &connector_i_ds_utf8);
response->set_connector_i_ds(connector_i_ds_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_i_ds()));
std::string connector_ids_utf8;
convert_to_grpc(connector_ids, &connector_ids_utf8);
response->set_connector_ids(connector_ids_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_connector_ids()));
return ::grpc::Status::OK;
}
}
Expand Down Expand Up @@ -3339,11 +3339,11 @@ namespace nirfmxvna_grpc {
}
int32 array_size = status;

std::string calkit_i_ds;
std::string calkit_ids;
if (array_size > 0) {
calkit_i_ds.resize(array_size - 1);
calkit_ids.resize(array_size - 1);
}
status = library_->CalkitManagerGetCalkitIDs(instrument, selector_string, array_size, (char*)calkit_i_ds.data());
status = library_->CalkitManagerGetCalkitIDs(instrument, selector_string, array_size, (char*)calkit_ids.data());
if (status == kErrorReadBufferTooSmall || status == kWarningCAPIStringTruncatedToFitBuffer || status > static_cast<decltype(status)>(array_size)) {
// buffer is now too small, try again
continue;
Expand All @@ -3352,10 +3352,10 @@ namespace nirfmxvna_grpc {
return ConvertApiErrorStatusForNiRFmxInstrHandle(context, status, instrument);
}
response->set_status(status);
std::string calkit_i_ds_utf8;
convert_to_grpc(calkit_i_ds, &calkit_i_ds_utf8);
response->set_calkit_i_ds(calkit_i_ds_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calkit_i_ds()));
std::string calkit_ids_utf8;
convert_to_grpc(calkit_ids, &calkit_ids_utf8);
response->set_calkit_ids(calkit_ids_utf8);
nidevice_grpc::converters::trim_trailing_nulls(*(response->mutable_calkit_ids()));
return ::grpc::Status::OK;
}
}
Expand Down
5 changes: 5 additions & 0 deletions source/codegen/metadata/nirfmxvna/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,7 @@
},
{
'direction': 'out',
'grpc_name': 'connector_ids',
'name': 'connectorIDs',
'size': {
'mechanism': 'ivi-dance',
Expand Down Expand Up @@ -1902,6 +1903,7 @@
},
{
'direction': 'in',
'grpc_name': 'connector_ids',
'name': 'connectorIDs',
'type': 'char[]'
},
Expand Down Expand Up @@ -2258,6 +2260,7 @@
},
{
'direction': 'out',
'grpc_name': 'calibration_element_ids',
'name': 'calibrationElementIDs',
'size': {
'mechanism': 'ivi-dance',
Expand Down Expand Up @@ -2288,6 +2291,7 @@
},
{
'direction': 'out',
'grpc_name': 'connector_ids',
'name': 'connectorIDs',
'size': {
'mechanism': 'ivi-dance',
Expand Down Expand Up @@ -2595,6 +2599,7 @@
},
{
'direction': 'out',
'grpc_name': 'calkit_ids',
'name': 'calkitIDs',
'size': {
'mechanism': 'ivi-dance',
Expand Down