Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions generated/nirfmxvna/nirfmxvna.proto
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 @@ -1585,7 +1585,7 @@ message CalkitManagerCalkitGetConnectorIDsRequest {

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

message CalkitManagerCalkitGetDescriptionRequest {
Expand Down
4 changes: 2 additions & 2 deletions generated/nirfmxvna/nirfmxvna_client.cpp
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
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
34 changes: 17 additions & 17 deletions generated/nirfmxvna/nirfmxvna_service.cpp
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 @@ -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
5 changes: 4 additions & 1 deletion source/codegen/metadata/nirfmxvna/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from .functions import functions
from .functions_addon import functions_override_metadata
from .attributes import attributes
from .enums import enums
from .config import config
Expand All @@ -8,4 +9,6 @@
"attributes": attributes,
"enums": enums,
"config": config
}
}

metadata['functions'].update(functions_override_metadata)
89 changes: 89 additions & 0 deletions source/codegen/metadata/nirfmxvna/functions_addon.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,91 @@
functions_override_metadata = {
'CalkitManagerCalkitCalibrationElementGetPortConnectors': {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Normally we fix this by adding a transform in scrapigen that updates grpc_name in the functions.py file. I have never used functions_addon (I think) since I've worked on grpc-device. Maybe that was originally for some MI APIs where functions.py was an external source-of-truth. But for RFmx, we are already generating the metadata for grpc-device from scrapigen, so we can include it in the primary functions.py metadata.

I wonder if just adding IDs or something similar to ADDITIONAL_ACRONYMS would fix this? Maybe this case is slightly different from other analyze_acronyms use-cases. You can also have a custom transform that patches a specific parameter name with a grpc_name.

'parameters': [
{
'direction': 'in',
'grpc_name': 'instrument',
'name': 'instrumentHandle',
'type': 'niRFmxInstrHandle'
},
{
'direction': 'in',
'name': 'selectorString',
'type': 'char[]'
},
{
'direction': 'in',
'name': 'arraySize',
'type': 'int32'
},
{
'direction': 'out',
'grpc_name': 'connector_ids',
'name': 'connectorIDs',
'size': {
'mechanism': 'ivi-dance',
'value': 'arraySize'
},
'type': 'char[]'
}
],
'returns': 'int32'
},
'CalkitManagerCalkitCalibrationElementSetPortConnectors': {
'parameters': [
{
'direction': 'in',
'grpc_name': 'instrument',
'name': 'instrumentHandle',
'type': 'niRFmxInstrHandle'
},
{
'direction': 'in',
'name': 'selectorString',
'type': 'char[]'
},
{
'direction': 'in',
'grpc_name': 'connector_ids',
'name': 'connectorIDs',
'type': 'char[]'
},
{
'direction': 'in',
'name': 'arraySize',
'type': 'int32'
}
],
'returns': 'int32'
},
'CalkitManagerCalkitGetConnectorIDs': {
'parameters': [
{
'direction': 'in',
'grpc_name': 'instrument',
'name': 'instrumentHandle',
'type': 'niRFmxInstrHandle'
},
{
'direction': 'in',
'name': 'selectorString',
'type': 'char[]'
},
{
'direction': 'in',
'name': 'arraySize',
'type': 'int32'
},
{
'direction': 'out',
'grpc_name': 'connector_ids',
'name': 'connectorIDs',
'size': {
'mechanism': 'ivi-dance',
'value': 'arraySize'
},
'type': 'char[]'
}
],
'returns': 'int32'
}
}