diff --git a/generated/nirfmxvna/nirfmxvna.proto b/generated/nirfmxvna/nirfmxvna.proto index 64af69848..89c1c0d3d 100644 --- a/generated/nirfmxvna/nirfmxvna.proto +++ b/generated/nirfmxvna/nirfmxvna.proto @@ -915,7 +915,7 @@ message CalkitManagerCalkitCalibrationElementGetPortConnectorsRequest { message CalkitManagerCalkitCalibrationElementGetPortConnectorsResponse { int32 status = 1; - string connector_i_ds = 2; + string connector_ids = 2; } message CalkitManagerCalkitCalibrationElementGetSParameterDefinitionRequest { @@ -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; } @@ -1585,7 +1585,7 @@ message CalkitManagerCalkitGetConnectorIDsRequest { message CalkitManagerCalkitGetConnectorIDsResponse { int32 status = 1; - string connector_i_ds = 2; + string connector_ids = 2; } message CalkitManagerCalkitGetDescriptionRequest { diff --git a/generated/nirfmxvna/nirfmxvna_client.cpp b/generated/nirfmxvna/nirfmxvna_client.cpp index e2456fa12..73de57eff 100644 --- a/generated/nirfmxvna/nirfmxvna_client.cpp +++ b/generated/nirfmxvna/nirfmxvna_client.cpp @@ -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{}; diff --git a/generated/nirfmxvna/nirfmxvna_client.h b/generated/nirfmxvna/nirfmxvna_client.h index 52df5626a..41e487e69 100644 --- a/generated/nirfmxvna/nirfmxvna_client.h +++ b/generated/nirfmxvna/nirfmxvna_client.h @@ -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& 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& calibration_element_types); CalkitManagerCalkitConnectorGetDescriptionResponse calkit_manager_calkit_connector_get_description(const StubPtr& stub, const nidevice_grpc::Session& instrument, const std::string& selector_string); diff --git a/generated/nirfmxvna/nirfmxvna_service.cpp b/generated/nirfmxvna/nirfmxvna_service.cpp index 38f13e57d..d928af48c 100644 --- a/generated/nirfmxvna/nirfmxvna_service.cpp +++ b/generated/nirfmxvna/nirfmxvna_service.cpp @@ -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(array_size)) { // buffer is now too small, try again continue; @@ -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; } } @@ -2412,10 +2412,10 @@ namespace nirfmxvna_grpc { niRFmxInstrHandle instrument = session_repository_->access_session(instrument_grpc_session.name()); auto selector_string_mbcs = convert_from_grpc(request->selector_string()); char* selector_string = (char*)selector_string_mbcs.c_str(); - auto connector_i_ds_mbcs = convert_from_grpc(request->connector_i_ds()); - char* connector_i_ds = (char*)connector_i_ds_mbcs.c_str(); + auto connector_ids_mbcs = convert_from_grpc(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); } @@ -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(array_size)) { // buffer is now too small, try again continue; @@ -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; } } diff --git a/source/codegen/metadata/nirfmxvna/__init__.py b/source/codegen/metadata/nirfmxvna/__init__.py index 3c2261f56..a7a42f530 100644 --- a/source/codegen/metadata/nirfmxvna/__init__.py +++ b/source/codegen/metadata/nirfmxvna/__init__.py @@ -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 @@ -8,4 +9,6 @@ "attributes": attributes, "enums": enums, "config": config -} \ No newline at end of file +} + +metadata['functions'].update(functions_override_metadata) \ No newline at end of file diff --git a/source/codegen/metadata/nirfmxvna/functions_addon.py b/source/codegen/metadata/nirfmxvna/functions_addon.py index 86bf60293..dfbe52acd 100644 --- a/source/codegen/metadata/nirfmxvna/functions_addon.py +++ b/source/codegen/metadata/nirfmxvna/functions_addon.py @@ -1,2 +1,91 @@ functions_override_metadata = { + 'CalkitManagerCalkitCalibrationElementGetPortConnectors': { + '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' + } } \ No newline at end of file