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

Jump to bottom

[PR0] Update NIDAQmx.h and other nidaqmx metadata files to v23.0 #881

Merged
merged 16 commits into from
Mar 14, 2023
Merged

[PR0] Update NIDAQmx.h and other nidaqmx metadata files to v23.0 #881

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f34c995
Update NIDAQmx.h file to v23.0
vigkre Mar 9, 2023
7c9628f
Enums metadata updated with source files scrapigen v23.0 update
vigkre Mar 9, 2023
8da0ec3
Proto file generated after enums metadata in v23.0 update
vigkre Mar 9, 2023
9711508
Functions metadata from scrapigen v23.0 source file update
vigkre Mar 9, 2023
f4b36cd
Out files generated after updating Functions metadata from scrapigen …
vigkre Mar 9, 2023
adc35ba
Attributes metadata from scrapigen v23.0 source file update
vigkre Mar 9, 2023
94fcdaf
Out files generated after updating Attributes metadata from scrapige…
vigkre Mar 9, 2023
8012f44
Add force-include field to surpass validation
vigkre Mar 10, 2023
b23fc4a
Added a suppression logic to exclude enums in proto files
vigkre Mar 10, 2023
f0c7b89
Update api_version in config.py to 23.0.0
vigkre Mar 10, 2023
f73664a
Formatting using black
vigkre Mar 12, 2023
d88e864
Add comments for ENUMS_SHOULD_BE_USED rule
vigkre Mar 13, 2023
2375ced
Add comments for validation suppression in enums for DAQmx metadata
vigkre Mar 13, 2023
f280f2a
Metadata updated after compatibility fixed in scrapigen
vigkre Mar 14, 2023
8afa508
Generated files after fixing compatibility issue in scrapigen code
vigkre Mar 14, 2023
0aad37d
Fix styleguide
vigkre Mar 14, 2023
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,001 changes: 1,991 additions & 10 deletions generated/nidaqmx/nidaqmx.proto
View file
Open in desktop

Large diffs are not rendered by default.

116 changes: 114 additions & 2 deletions generated/nidaqmx/nidaqmx_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1732,6 +1732,28 @@ create_ai_pos_rvdt_chan(const StubPtr& stub, const nidevice_grpc::Session& task,
return response;
}

CreateAIPowerChanResponse
create_ai_power_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& voltage_setpoint, const double& current_setpoint, const bool& output_enable)
{
::grpc::ClientContext context;

auto request = CreateAIPowerChanRequest{};
request.mutable_task()->CopyFrom(task);
request.set_physical_channel(physical_channel);
request.set_name_to_assign_to_channel(name_to_assign_to_channel);
request.set_voltage_setpoint(voltage_setpoint);
request.set_current_setpoint(current_setpoint);
request.set_output_enable(output_enable);

auto response = CreateAIPowerChanResponse{};

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

return response;
}

CreateAIPressureBridgePolynomialChanResponse
create_ai_pressure_bridge_polynomial_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<PressureUnits, pb::int32>& units, const simple_variant<BridgeConfiguration1, pb::int32>& bridge_config, const simple_variant<ExcitationSource, pb::int32>& voltage_excit_source, const double& voltage_excit_val, const double& nominal_bridge_resistance, const std::vector<double>& forward_coeffs, const std::vector<double>& reverse_coeffs, const simple_variant<BridgeElectricalUnits, pb::int32>& electrical_units, const simple_variant<BridgePhysicalUnits, pb::int32>& physical_units, const std::string& custom_scale_name)
{
Expand Down Expand Up @@ -4697,13 +4719,13 @@ get_analog_power_up_states(const StubPtr& stub, const std::string& device_name,
}

GetAnalogPowerUpStatesWithOutputTypeResponse
get_analog_power_up_states_with_output_type(const StubPtr& stub, const std::string& channel_names, const pb::uint32& array_size)
get_analog_power_up_states_with_output_type(const StubPtr& stub, const std::string& channel_names, const pb::uint32& array_size_ptr)
{
::grpc::ClientContext context;

auto request = GetAnalogPowerUpStatesWithOutputTypeRequest{};
request.set_channel_names(channel_names);
request.set_array_size(array_size);
request.set_array_size_ptr(array_size_ptr);

auto response = GetAnalogPowerUpStatesWithOutputTypeResponse{};

Expand Down Expand Up @@ -5456,6 +5478,22 @@ get_exported_signal_attribute_uint32(const StubPtr& stub, const nidevice_grpc::S
return response;
}

GetExtendedErrorInfoResponse
get_extended_error_info(const StubPtr& stub)
{
::grpc::ClientContext context;

auto request = GetExtendedErrorInfoRequest{};

auto response = GetExtendedErrorInfoResponse{};

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

return response;
}

GetFirstSampClkWhenResponse
get_first_samp_clk_when(const StubPtr& stub, const nidevice_grpc::Session& task)
{
Expand Down Expand Up @@ -7856,6 +7894,80 @@ read_digital_u8(const StubPtr& stub, const nidevice_grpc::Session& task, const p
return response;
}

ReadPowerBinaryI16Response
read_power_binary_i16(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps)
{
::grpc::ClientContext context;

auto request = ReadPowerBinaryI16Request{};
request.mutable_task()->CopyFrom(task);
request.set_num_samps_per_chan(num_samps_per_chan);
request.set_timeout(timeout);
const auto fill_mode_ptr = fill_mode.get_if<GroupBy>();
const auto fill_mode_raw_ptr = fill_mode.get_if<pb::int32>();
if (fill_mode_ptr) {
request.set_fill_mode(*fill_mode_ptr);
}
else if (fill_mode_raw_ptr) {
request.set_fill_mode_raw(*fill_mode_raw_ptr);
}
request.set_array_size_in_samps(array_size_in_samps);

auto response = ReadPowerBinaryI16Response{};

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

return response;
}

ReadPowerF64Response
read_power_f64(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps)
{
::grpc::ClientContext context;

auto request = ReadPowerF64Request{};
request.mutable_task()->CopyFrom(task);
request.set_num_samps_per_chan(num_samps_per_chan);
request.set_timeout(timeout);
const auto fill_mode_ptr = fill_mode.get_if<GroupBy>();
const auto fill_mode_raw_ptr = fill_mode.get_if<pb::int32>();
if (fill_mode_ptr) {
request.set_fill_mode(*fill_mode_ptr);
}
else if (fill_mode_raw_ptr) {
request.set_fill_mode_raw(*fill_mode_raw_ptr);
}
request.set_array_size_in_samps(array_size_in_samps);

auto response = ReadPowerF64Response{};

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

return response;
}

ReadPowerScalarF64Response
read_power_scalar_f64(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout)
{
::grpc::ClientContext context;

auto request = ReadPowerScalarF64Request{};
request.mutable_task()->CopyFrom(task);
request.set_timeout(timeout);

auto response = ReadPowerScalarF64Response{};

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

return response;
}

ReadRawResponse
read_raw(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const pb::uint32& array_size_in_bytes)
{
Expand Down
7 changes: 6 additions & 1 deletion generated/nidaqmx/nidaqmx_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ CreateAIMicrophoneChanResponse create_ai_microphone_chan(const StubPtr& stub, co
CreateAIPosEddyCurrProxProbeChanResponse create_ai_pos_eddy_curr_prox_probe_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<LengthUnits2, pb::int32>& units, const double& sensitivity, const simple_variant<EddyCurrentProxProbeSensitivityUnits, pb::int32>& sensitivity_units, const std::string& custom_scale_name);
CreateAIPosLVDTChanResponse create_ai_pos_lvdt_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<LengthUnits2, pb::int32>& units, const double& sensitivity, const simple_variant<LVDTSensitivityUnits1, pb::int32>& sensitivity_units, const simple_variant<ExcitationSource, pb::int32>& voltage_excit_source, const double& voltage_excit_val, const double& voltage_excit_freq, const simple_variant<ACExcitWireMode, pb::int32>& ac_excit_wire_mode, const std::string& custom_scale_name);
CreateAIPosRVDTChanResponse create_ai_pos_rvdt_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<AngleUnits1, pb::int32>& units, const double& sensitivity, const simple_variant<RVDTSensitivityUnits1, pb::int32>& sensitivity_units, const simple_variant<ExcitationSource, pb::int32>& voltage_excit_source, const double& voltage_excit_val, const double& voltage_excit_freq, const simple_variant<ACExcitWireMode, pb::int32>& ac_excit_wire_mode, const std::string& custom_scale_name);
CreateAIPowerChanResponse create_ai_power_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& voltage_setpoint, const double& current_setpoint, const bool& output_enable);
CreateAIPressureBridgePolynomialChanResponse create_ai_pressure_bridge_polynomial_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<PressureUnits, pb::int32>& units, const simple_variant<BridgeConfiguration1, pb::int32>& bridge_config, const simple_variant<ExcitationSource, pb::int32>& voltage_excit_source, const double& voltage_excit_val, const double& nominal_bridge_resistance, const std::vector<double>& forward_coeffs, const std::vector<double>& reverse_coeffs, const simple_variant<BridgeElectricalUnits, pb::int32>& electrical_units, const simple_variant<BridgePhysicalUnits, pb::int32>& physical_units, const std::string& custom_scale_name);
CreateAIPressureBridgeTableChanResponse create_ai_pressure_bridge_table_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<PressureUnits, pb::int32>& units, const simple_variant<BridgeConfiguration1, pb::int32>& bridge_config, const simple_variant<ExcitationSource, pb::int32>& voltage_excit_source, const double& voltage_excit_val, const double& nominal_bridge_resistance, const std::vector<double>& electrical_vals, const simple_variant<BridgeElectricalUnits, pb::int32>& electrical_units, const std::vector<double>& physical_vals, const simple_variant<BridgePhysicalUnits, pb::int32>& physical_units, const std::string& custom_scale_name);
CreateAIPressureBridgeTwoPointLinChanResponse create_ai_pressure_bridge_two_point_lin_chan(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& physical_channel, const std::string& name_to_assign_to_channel, const double& min_val, const double& max_val, const simple_variant<PressureUnits, pb::int32>& units, const simple_variant<BridgeConfiguration1, pb::int32>& bridge_config, const simple_variant<ExcitationSource, pb::int32>& voltage_excit_source, const double& voltage_excit_val, const double& nominal_bridge_resistance, const double& first_electrical_val, const double& second_electrical_val, const simple_variant<BridgeElectricalUnits, pb::int32>& electrical_units, const double& first_physical_val, const double& second_physical_val, const simple_variant<BridgePhysicalUnits, pb::int32>& physical_units, const std::string& custom_scale_name);
Expand Down Expand Up @@ -151,7 +152,7 @@ ExportSignalResponse export_signal(const StubPtr& stub, const nidevice_grpc::Ses
GetAIChanCalCalDateResponse get_ai_chan_cal_cal_date(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& channel_name);
GetAIChanCalExpDateResponse get_ai_chan_cal_exp_date(const StubPtr& stub, const nidevice_grpc::Session& task, const std::string& channel_name);
GetAnalogPowerUpStatesResponse get_analog_power_up_states(const StubPtr& stub, const std::string& device_name, const std::vector<AnalogPowerUpChannelAndType>& channels);
GetAnalogPowerUpStatesWithOutputTypeResponse get_analog_power_up_states_with_output_type(const StubPtr& stub, const std::string& channel_names, const pb::uint32& array_size);
GetAnalogPowerUpStatesWithOutputTypeResponse get_analog_power_up_states_with_output_type(const StubPtr& stub, const std::string& channel_names, const pb::uint32& array_size_ptr);
GetArmStartTrigTimestampValResponse get_arm_start_trig_timestamp_val(const StubPtr& stub, const nidevice_grpc::Session& task);
GetArmStartTrigTrigWhenResponse get_arm_start_trig_trig_when(const StubPtr& stub, const nidevice_grpc::Session& task);
GetAutoConfiguredCDAQSyncConnectionsResponse get_auto_configured_cdaq_sync_connections(const StubPtr& stub);
Expand Down Expand Up @@ -184,6 +185,7 @@ GetExportedSignalAttributeDoubleResponse get_exported_signal_attribute_double(co
GetExportedSignalAttributeInt32Response get_exported_signal_attribute_int32(const StubPtr& stub, const nidevice_grpc::Session& task, const simple_variant<ExportSignalInt32Attribute, pb::int32>& attribute);
GetExportedSignalAttributeStringResponse get_exported_signal_attribute_string(const StubPtr& stub, const nidevice_grpc::Session& task, const simple_variant<ExportSignalStringAttribute, pb::int32>& attribute);
GetExportedSignalAttributeUInt32Response get_exported_signal_attribute_uint32(const StubPtr& stub, const nidevice_grpc::Session& task, const simple_variant<ExportSignalUInt32Attribute, pb::int32>& attribute);
GetExtendedErrorInfoResponse get_extended_error_info(const StubPtr& stub);
GetFirstSampClkWhenResponse get_first_samp_clk_when(const StubPtr& stub, const nidevice_grpc::Session& task);
GetFirstSampTimestampValResponse get_first_samp_timestamp_val(const StubPtr& stub, const nidevice_grpc::Session& task);
GetNthTaskChannelResponse get_nth_task_channel(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::uint32& index);
Expand Down Expand Up @@ -284,6 +286,9 @@ ReadDigitalScalarU32Response read_digital_scalar_u32(const StubPtr& stub, const
ReadDigitalU16Response read_digital_u16(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps);
ReadDigitalU32Response read_digital_u32(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps);
ReadDigitalU8Response read_digital_u8(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps);
ReadPowerBinaryI16Response read_power_binary_i16(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps);
ReadPowerF64Response read_power_f64(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& fill_mode, const pb::uint32& array_size_in_samps);
ReadPowerScalarF64Response read_power_scalar_f64(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout);
ReadRawResponse read_raw(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const pb::uint32& array_size_in_bytes);
std::unique_ptr<grpc::ClientReader<RegisterDoneEventResponse>> register_done_event(const StubPtr& stub, ::grpc::ClientContext& context, const nidevice_grpc::Session& task);
std::unique_ptr<grpc::ClientReader<RegisterEveryNSamplesEventResponse>> register_every_n_samples_event(const StubPtr& stub, ::grpc::ClientContext& context, const nidevice_grpc::Session& task, const simple_variant<EveryNSamplesEventType, pb::int32>& every_n_samples_event_type, const pb::uint32& n_samples);
Expand Down
Loading