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 11 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
125 changes: 114 additions & 11 deletions generated/nidaqmx/nidaqmx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

//---------------------------------------------------------------------
// This file is generated from NI-DAQMX API metadata version 20.0.0
// This file is generated from NI-DAQMX API metadata version 23.0.0
//---------------------------------------------------------------------
// Proto file for the NI-DAQMX Metadata
//---------------------------------------------------------------------
Expand Down Expand Up @@ -68,6 +68,7 @@ service NiDAQmx {
rpc CreateAIPosEddyCurrProxProbeChan(CreateAIPosEddyCurrProxProbeChanRequest) returns (CreateAIPosEddyCurrProxProbeChanResponse);
rpc CreateAIPosLVDTChan(CreateAIPosLVDTChanRequest) returns (CreateAIPosLVDTChanResponse);
rpc CreateAIPosRVDTChan(CreateAIPosRVDTChanRequest) returns (CreateAIPosRVDTChanResponse);
rpc CreateAIPowerChan(CreateAIPowerChanRequest) returns (CreateAIPowerChanResponse);
vigkre marked this conversation as resolved.
Show resolved Hide resolved
rpc CreateAIPressureBridgePolynomialChan(CreateAIPressureBridgePolynomialChanRequest) returns (CreateAIPressureBridgePolynomialChanResponse);
rpc CreateAIPressureBridgeTableChan(CreateAIPressureBridgeTableChanRequest) returns (CreateAIPressureBridgeTableChanResponse);
rpc CreateAIPressureBridgeTwoPointLinChan(CreateAIPressureBridgeTwoPointLinChanRequest) returns (CreateAIPressureBridgeTwoPointLinChanResponse);
Expand Down Expand Up @@ -179,6 +180,7 @@ service NiDAQmx {
rpc GetExportedSignalAttributeInt32(GetExportedSignalAttributeInt32Request) returns (GetExportedSignalAttributeInt32Response);
rpc GetExportedSignalAttributeString(GetExportedSignalAttributeStringRequest) returns (GetExportedSignalAttributeStringResponse);
rpc GetExportedSignalAttributeUInt32(GetExportedSignalAttributeUInt32Request) returns (GetExportedSignalAttributeUInt32Response);
rpc GetExtendedErrorInfo(GetExtendedErrorInfoRequest) returns (GetExtendedErrorInfoResponse);
rpc GetFirstSampClkWhen(GetFirstSampClkWhenRequest) returns (GetFirstSampClkWhenResponse);
rpc GetFirstSampTimestampVal(GetFirstSampTimestampValRequest) returns (GetFirstSampTimestampValResponse);
rpc GetNthTaskChannel(GetNthTaskChannelRequest) returns (GetNthTaskChannelResponse);
Expand Down Expand Up @@ -279,6 +281,9 @@ service NiDAQmx {
rpc ReadDigitalU16(ReadDigitalU16Request) returns (ReadDigitalU16Response);
rpc ReadDigitalU32(ReadDigitalU32Request) returns (ReadDigitalU32Response);
rpc ReadDigitalU8(ReadDigitalU8Request) returns (ReadDigitalU8Response);
rpc ReadPowerBinaryI16(ReadPowerBinaryI16Request) returns (ReadPowerBinaryI16Response);
rpc ReadPowerF64(ReadPowerF64Request) returns (ReadPowerF64Response);
rpc ReadPowerScalarF64(ReadPowerScalarF64Request) returns (ReadPowerScalarF64Response);
rpc ReadRaw(ReadRawRequest) returns (ReadRawResponse);
rpc RegisterDoneEvent(RegisterDoneEventRequest) returns (stream RegisterDoneEventResponse);
rpc RegisterEveryNSamplesEvent(RegisterEveryNSamplesEventRequest) returns (stream RegisterEveryNSamplesEventResponse);
Expand Down Expand Up @@ -644,6 +649,9 @@ enum ChannelInt32Attribute {
CHANNEL_ATTRIBUTE_AI_FILTER_RESPONSE = 12661;
CHANNEL_ATTRIBUTE_CI_FILTER_RESPONSE = 12729;
CHANNEL_ATTRIBUTE_CI_FILTER_DELAY_UNITS = 12732;
CHANNEL_ATTRIBUTE_PWR_OUTPUT_STATE = 12759;
CHANNEL_ATTRIBUTE_PWR_IDLE_OUTPUT_BEHAVIOR = 12760;
CHANNEL_ATTRIBUTE_PWR_REMOTE_SENSE = 12763;
}

enum ChannelDoubleAttribute {
Expand Down Expand Up @@ -824,6 +832,8 @@ enum ChannelDoubleAttribute {
CHANNEL_ATTRIBUTE_CI_FILTER_DELAY = 12731;
CHANNEL_ATTRIBUTE_AO_FUNC_GEN_START_PHASE = 12740;
CHANNEL_ATTRIBUTE_AO_COMMON_MODE_OFFSET = 12748;
CHANNEL_ATTRIBUTE_PWR_VOLTAGE_SETPOINT = 12756;
CHANNEL_ATTRIBUTE_PWR_CURRENT_SETPOINT = 12757;
}

enum ChannelResetAttribute {
Expand Down Expand Up @@ -1381,6 +1391,11 @@ enum ChannelResetAttribute {
CHANNEL_RESET_ATTRIBUTE_CI_FILTER_DELAY_UNITS = 12732;
CHANNEL_RESET_ATTRIBUTE_AO_FUNC_GEN_START_PHASE = 12740;
CHANNEL_RESET_ATTRIBUTE_AO_COMMON_MODE_OFFSET = 12748;
CHANNEL_RESET_ATTRIBUTE_PWR_VOLTAGE_SETPOINT = 12756;
CHANNEL_RESET_ATTRIBUTE_PWR_CURRENT_SETPOINT = 12757;
CHANNEL_RESET_ATTRIBUTE_PWR_OUTPUT_ENABLE = 12758;
CHANNEL_RESET_ATTRIBUTE_PWR_IDLE_OUTPUT_BEHAVIOR = 12760;
CHANNEL_RESET_ATTRIBUTE_PWR_REMOTE_SENSE = 12763;
}

enum ChannelBoolAttribute {
Expand Down Expand Up @@ -1481,6 +1496,7 @@ enum ChannelBoolAttribute {
CHANNEL_ATTRIBUTE_AI_POWER_SUPPLY_FAULT_DETECT_ENABLE = 12689;
CHANNEL_ATTRIBUTE_AI_OVERCURRENT_DETECT_ENABLE = 12692;
CHANNEL_ATTRIBUTE_CI_FILTER_ENABLE = 12727;
CHANNEL_ATTRIBUTE_PWR_OUTPUT_ENABLE = 12758;
}

enum ChannelStringAttribute {
Expand Down Expand Up @@ -1610,6 +1626,8 @@ enum ChannelDoubleArrayAttribute {
CHANNEL_ATTRIBUTE_AI_BRIDGE_POLY_FORWARD_COEFF = 12176;
CHANNEL_ATTRIBUTE_AI_BRIDGE_POLY_REVERSE_COEFF = 12177;
CHANNEL_ATTRIBUTE_AI_DIG_FLTR_COEFF = 12487;
CHANNEL_ATTRIBUTE_PWR_VOLTAGE_DEV_SCALING_COEFF = 12761;
CHANNEL_ATTRIBUTE_PWR_CURRENT_DEV_SCALING_COEFF = 12762;
}

enum DeviceStringAttribute {
Expand Down Expand Up @@ -2093,6 +2111,9 @@ enum ReadBoolAttribute {
READ_ATTRIBUTE_SYNC_UNLOCKED_CHANS_EXIST = 12605;
READ_ATTRIBUTE_INPUT_LIMITS_FAULT_CHANS_EXIST = 12687;
READ_ATTRIBUTE_POWER_SUPPLY_FAULT_CHANS_EXIST = 12690;
READ_ATTRIBUTE_REMOTE_SENSE_ERROR_CHANS_EXIST = 12765;
READ_ATTRIBUTE_AUX_POWER_ERROR_CHANS_EXIST = 12767;
READ_ATTRIBUTE_REVERSE_VOLTAGE_ERROR_CHANS_EXIST = 12774;
}

enum ReadUInt64Attribute {
Expand Down Expand Up @@ -2131,6 +2152,9 @@ enum ReadStringAttribute {
READ_ATTRIBUTE_SYNC_UNLOCKED_CHANS = 12606;
READ_ATTRIBUTE_INPUT_LIMITS_FAULT_CHANS = 12688;
READ_ATTRIBUTE_POWER_SUPPLY_FAULT_CHANS = 12691;
READ_ATTRIBUTE_REMOTE_SENSE_ERROR_CHANS = 12766;
READ_ATTRIBUTE_AUX_POWER_ERROR_CHANS = 12768;
READ_ATTRIBUTE_REVERSE_VOLTAGE_ERROR_CHANS = 12775;
}

enum ReadDoubleAttribute {
Expand Down Expand Up @@ -3066,8 +3090,8 @@ enum GpsSignalType1 {
}

enum GroupBy {
GROUP_BY_GROUP_BY_CHANNEL = 0;
GROUP_BY_GROUP_BY_SCAN_NUMBER = 1;
GROUP_BY_CHANNEL = 0;
GROUP_BY_SCAN_NUMBER = 1;
}
vigkre marked this conversation as resolved.
Show resolved Hide resolved

enum InputTermCfgWithDefault {
Expand Down Expand Up @@ -3135,7 +3159,7 @@ enum LogicFamily {
LOGIC_FAMILY_UNSPECIFIED = 0;
LOGIC_FAMILY_2POINT_5_V = 14620;
LOGIC_FAMILY_3POINT_3_V = 14621;
LOGIC_FAMILY_5_V = 14619;
LOGIC_FAMILY_5V = 14619;
}
vigkre marked this conversation as resolved.
Show resolved Hide resolved

enum Polarity2 {
Expand Down Expand Up @@ -3473,6 +3497,7 @@ enum ChannelInt32AttributeValues {
CHANNEL_INT32_AI_MEASUREMENT_TYPE_TORQUE_BRIDGE = 15905;
CHANNEL_INT32_AI_MEASUREMENT_TYPE_TEDS_SENSOR = 12531;
CHANNEL_INT32_AI_MEASUREMENT_TYPE_CHARGE = 16105;
CHANNEL_INT32_AI_MEASUREMENT_TYPE_POWER = 16201;
CHANNEL_INT32_AO_IDLE_OUTPUT_BEHAVIOR_ZERO_VOLTS = 12526;
CHANNEL_INT32_AO_IDLE_OUTPUT_BEHAVIOR_HIGH_IMPEDANCE = 12527;
CHANNEL_INT32_AO_IDLE_OUTPUT_BEHAVIOR_MAINTAIN_EXISTING_VALUE = 12528;
Expand Down Expand Up @@ -3672,7 +3697,7 @@ enum ChannelInt32AttributeValues {
CHANNEL_INT32_LEVEL1_LOW = 10214;
CHANNEL_INT32_LOGIC_FAMILY_2POINT_5_V = 14620;
CHANNEL_INT32_LOGIC_FAMILY_3POINT_3_V = 14621;
CHANNEL_INT32_LOGIC_FAMILY_5_V = 14619;
CHANNEL_INT32_LOGIC_FAMILY_5V = 14619;
vigkre marked this conversation as resolved.
Show resolved Hide resolved
CHANNEL_INT32_LOGIC_LVL_BEHAVIOR_LOGIC_LEVEL_PULL_UP = 16064;
CHANNEL_INT32_LOGIC_LVL_BEHAVIOR_NONE = 10230;
CHANNEL_INT32_MODULATION_TYPE_AM = 14756;
Expand All @@ -3691,6 +3716,12 @@ enum ChannelInt32AttributeValues {
CHANNEL_INT32_OUTPUT_TERM_CFG_RSE = 10083;
CHANNEL_INT32_OUTPUT_TERM_CFG_DIFF = 10106;
CHANNEL_INT32_OUTPUT_TERM_CFG_PSEUDO_DIFF = 12529;
CHANNEL_INT32_POWER_IDLE_OUTPUT_BEHAVIOR_OUTPUT_DISABLED = 15503;
CHANNEL_INT32_POWER_IDLE_OUTPUT_BEHAVIOR_MAINTAIN_EXISTING_VALUE = 12528;
CHANNEL_INT32_POWER_OUTPUT_STATE_CONSTANT_VOLTAGE = 15500;
CHANNEL_INT32_POWER_OUTPUT_STATE_CONSTANT_CURRENT = 15501;
CHANNEL_INT32_POWER_OUTPUT_STATE_OVERVOLTAGE = 15502;
CHANNEL_INT32_POWER_OUTPUT_STATE_OUTPUT_DISABLED = 15503;
CHANNEL_INT32_PRESSURE_UNITS_PASCALS = 10081;
CHANNEL_INT32_PRESSURE_UNITS_POUNDS_PER_SQUARE_INCH = 15879;
CHANNEL_INT32_PRESSURE_UNITS_BAR = 15880;
Expand Down Expand Up @@ -3839,6 +3870,7 @@ enum DeviceInt32AttributeValues {
DEVICE_INT32_AI_MEASUREMENT_TYPE_TORQUE_BRIDGE = 15905;
DEVICE_INT32_AI_MEASUREMENT_TYPE_TEDS_SENSOR = 12531;
DEVICE_INT32_AI_MEASUREMENT_TYPE_CHARGE = 16105;
DEVICE_INT32_AI_MEASUREMENT_TYPE_POWER = 16201;
DEVICE_INT32_AO_OUTPUT_CHANNEL_TYPE_VOLTAGE = 10322;
DEVICE_INT32_AO_OUTPUT_CHANNEL_TYPE_CURRENT = 10134;
DEVICE_INT32_AO_OUTPUT_CHANNEL_TYPE_FUNC_GEN = 14750;
Expand All @@ -3852,9 +3884,9 @@ enum DeviceInt32AttributeValues {
DEVICE_INT32_ANT_STATUS_ABSENT = 15994;
DEVICE_INT32_ANT_STATUS_OVERCURRENT = 15995;
DEVICE_INT32_BUS_TYPE_PCI = 12582;
DEVICE_INT32_BUS_TYPE_PC_IE = 13612;
DEVICE_INT32_BUS_TYPE_PCIE = 13612;
DEVICE_INT32_BUS_TYPE_PXI = 12583;
DEVICE_INT32_BUS_TYPE_PX_IE = 14706;
DEVICE_INT32_BUS_TYPE_PXIE = 14706;
reckenro marked this conversation as resolved.
Show resolved Hide resolved
DEVICE_INT32_BUS_TYPE_SCXI = 12584;
DEVICE_INT32_BUS_TYPE_SCC = 14707;
DEVICE_INT32_BUS_TYPE_PC_CARD = 12585;
Expand Down Expand Up @@ -3922,6 +3954,8 @@ enum DeviceInt32AttributeValues {
DEVICE_INT32_PRODUCT_CATEGORY_NETWORK_DAQ = 14829;
DEVICE_INT32_PRODUCT_CATEGORY_SC_EXPRESS = 15886;
DEVICE_INT32_PRODUCT_CATEGORY_FIELD_DAQ = 16151;
DEVICE_INT32_PRODUCT_CATEGORY_TEST_SCALE_CHASSIS = 16180;
DEVICE_INT32_PRODUCT_CATEGORY_TEST_SCALE_MODULE = 16181;
DEVICE_INT32_PRODUCT_CATEGORY_UNKNOWN = 12588;
DEVICE_INT32_TRIGGER_USAGE_ADVANCE = 12488;
DEVICE_INT32_TRIGGER_USAGE_PAUSE = 12489;
Expand Down Expand Up @@ -3987,12 +4021,13 @@ enum PhysicalChannelInt32AttributeValues {
PHYSICALCHANNEL_INT32_AI_MEASUREMENT_TYPE_TORQUE_BRIDGE = 15905;
PHYSICALCHANNEL_INT32_AI_MEASUREMENT_TYPE_TEDS_SENSOR = 12531;
PHYSICALCHANNEL_INT32_AI_MEASUREMENT_TYPE_CHARGE = 16105;
PHYSICALCHANNEL_INT32_AI_MEASUREMENT_TYPE_POWER = 16201;
PHYSICALCHANNEL_INT32_AO_OUTPUT_CHANNEL_TYPE_VOLTAGE = 10322;
PHYSICALCHANNEL_INT32_AO_OUTPUT_CHANNEL_TYPE_CURRENT = 10134;
PHYSICALCHANNEL_INT32_AO_OUTPUT_CHANNEL_TYPE_FUNC_GEN = 14750;
PHYSICALCHANNEL_INT32_AO_POWER_UP_OUTPUT_BEHAVIOR_10322 = 10322;
PHYSICALCHANNEL_INT32_AO_POWER_UP_OUTPUT_BEHAVIOR_10134 = 10134;
PHYSICALCHANNEL_INT32_AO_POWER_UP_OUTPUT_BEHAVIOR_12527 = 12527;
PHYSICALCHANNEL_INT32_AO_POWER_UP_OUTPUT_BEHAVIOR_VOLTAGE = 10322;
PHYSICALCHANNEL_INT32_AO_POWER_UP_OUTPUT_BEHAVIOR_CURRENT = 10134;
PHYSICALCHANNEL_INT32_AO_POWER_UP_OUTPUT_BEHAVIOR_HIGH_IMPEDANCE = 12527;
reckenro marked this conversation as resolved.
Show resolved Hide resolved
PHYSICALCHANNEL_INT32_ACQUISITION_TYPE_FINITE_SAMPS = 10178;
PHYSICALCHANNEL_INT32_ACQUISITION_TYPE_CONT_SAMPS = 10123;
PHYSICALCHANNEL_INT32_ACQUISITION_TYPE_HW_TIMED_SINGLE_POINT = 12522;
Expand Down Expand Up @@ -5193,6 +5228,19 @@ message CreateAIPosRVDTChanResponse {
int32 status = 1;
}

message CreateAIPowerChanRequest {
nidevice_grpc.Session task = 1;
string physical_channel = 2;
string name_to_assign_to_channel = 3;
double voltage_setpoint = 4;
double current_setpoint = 5;
bool output_enable = 6;
}

message CreateAIPowerChanResponse {
int32 status = 1;
}

message CreateAIPressureBridgePolynomialChanRequest {
nidevice_grpc.Session task = 1;
string physical_channel = 2;
Expand Down Expand Up @@ -6851,7 +6899,7 @@ message GetAnalogPowerUpStatesResponse {

message GetAnalogPowerUpStatesWithOutputTypeRequest {
string channel_names = 1;
uint32 array_size = 2;
uint32 array_size_ptr = 2;
}

message GetAnalogPowerUpStatesWithOutputTypeResponse {
Expand Down Expand Up @@ -7255,6 +7303,14 @@ message GetExportedSignalAttributeUInt32Response {
uint32 value = 2;
}

message GetExtendedErrorInfoRequest {
}

message GetExtendedErrorInfoResponse {
int32 status = 1;
string error_string = 2;
}

message GetFirstSampClkWhenRequest {
nidevice_grpc.Session task = 1;
}
Expand Down Expand Up @@ -8578,6 +8634,53 @@ message ReadDigitalU8Response {
int32 samps_per_chan_read = 3;
}

message ReadPowerBinaryI16Request {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
double timeout = 3;
oneof fill_mode_enum {
GroupBy fill_mode = 4;
int32 fill_mode_raw = 5;
}
uint32 array_size_in_samps = 6;
}

message ReadPowerBinaryI16Response {
int32 status = 1;
repeated int32 read_array_voltage = 2;
repeated int32 read_array_current = 3;
int32 samps_per_chan_read = 4;
}

message ReadPowerF64Request {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
double timeout = 3;
oneof fill_mode_enum {
GroupBy fill_mode = 4;
int32 fill_mode_raw = 5;
}
uint32 array_size_in_samps = 6;
}

message ReadPowerF64Response {
int32 status = 1;
repeated double read_array_voltage = 2;
repeated double read_array_current = 3;
int32 samps_per_chan_read = 4;
}

message ReadPowerScalarF64Request {
nidevice_grpc.Session task = 1;
double timeout = 2;
}

message ReadPowerScalarF64Response {
int32 status = 1;
double voltage = 2;
double current = 3;
}

message ReadRawRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
Expand Down
Loading