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

Add codegen support for Daqmx Write apis which have multiple in params. #1130

Merged
merged 27 commits into from
Nov 28, 2024
Merged

Add codegen support for Daqmx Write apis which have multiple in params. #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
78ce3a0
add new meesage to proto for moniker streaming call
doshirohan Nov 16, 2024
36e8360
work-in-progress: codegen changes for service.cpp generation with res…
doshirohan Nov 18, 2024
4392afb
run codegen after resolving merge conflicts
doshirohan Nov 19, 2024
5b013cc
return failure error code from moniker APIs
doshirohan Nov 19, 2024
4324a98
update proto and struct to contain request and response messages
doshirohan Nov 23, 2024
baffd64
standardize to send output in response parameter for moniker APIs
doshirohan Nov 23, 2024
9f3524c
fix black formatter issues
doshirohan Nov 23, 2024
b7da3f8
fix build error
doshirohan Nov 23, 2024
c58b240
cleanup scripts
doshirohan Nov 23, 2024
09f34aa
fix tests
doshirohan Nov 23, 2024
11fff46
script and cpp cleanup
doshirohan Nov 23, 2024
f59d24f
codegen for read apis with multiple out params
Nov 25, 2024
1a15f05
added condition to call reserve and resize functions for some param t…
Nov 25, 2024
54e6850
add type hints for python helpers
doshirohan Nov 26, 2024
f9c5ce5
fix black formatter issues
doshirohan Nov 26, 2024
314eb0e
return error status from Write* moniker functions
doshirohan Nov 26, 2024
e7b2305
fix type hints
doshirohan Nov 26, 2024
4f48972
Merge branch 'users/rrawat/multiple_param_daqmx' of https://github.co…
Nov 26, 2024
5f8b1c2
codegen for write apis with multiple out params
Nov 26, 2024
ae45956
Merge branch 'main' of https://github.com/ni/grpc-device into users/r…
Nov 26, 2024
d3ea52a
merged latest main
Nov 26, 2024
06e21ce
Merge branch 'users/rrawat/multiple_param_daqmx' of https://github.co…
Nov 26, 2024
0cfff78
cleanup
Nov 26, 2024
d8a8729
Merge branch 'main' of https://github.com/ni/grpc-device into users/r…
Nov 27, 2024
fc2b244
resolved build errors
Nov 27, 2024
b85bb1c
fixed failing tests
Nov 28, 2024
49d4456
removed comment from code
Nov 28, 2024
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
218 changes: 218 additions & 0 deletions generated/nidaqmx/nidaqmx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,20 +438,29 @@ service NiDAQmx {
rpc WriteBinaryU32(WriteBinaryU32Request) returns (WriteBinaryU32Response);
rpc BeginWriteBinaryU32(BeginWriteBinaryU32Request) returns (BeginWriteBinaryU32Response);
rpc WriteCtrFreq(WriteCtrFreqRequest) returns (WriteCtrFreqResponse);
rpc BeginWriteCtrFreq(BeginWriteCtrFreqRequest) returns (BeginWriteCtrFreqResponse);
rpc WriteCtrFreqScalar(WriteCtrFreqScalarRequest) returns (WriteCtrFreqScalarResponse);
rpc BeginWriteCtrFreqScalar(BeginWriteCtrFreqScalarRequest) returns (BeginWriteCtrFreqScalarResponse);
rpc WriteCtrTicks(WriteCtrTicksRequest) returns (WriteCtrTicksResponse);
rpc BeginWriteCtrTicks(BeginWriteCtrTicksRequest) returns (BeginWriteCtrTicksResponse);
rpc WriteCtrTicksScalar(WriteCtrTicksScalarRequest) returns (WriteCtrTicksScalarResponse);
rpc BeginWriteCtrTicksScalar(BeginWriteCtrTicksScalarRequest) returns (BeginWriteCtrTicksScalarResponse);
rpc WriteCtrTime(WriteCtrTimeRequest) returns (WriteCtrTimeResponse);
rpc BeginWriteCtrTime(BeginWriteCtrTimeRequest) returns (BeginWriteCtrTimeResponse);
rpc WriteCtrTimeScalar(WriteCtrTimeScalarRequest) returns (WriteCtrTimeScalarResponse);
rpc BeginWriteCtrTimeScalar(BeginWriteCtrTimeScalarRequest) returns (BeginWriteCtrTimeScalarResponse);
rpc WriteDigitalLines(WriteDigitalLinesRequest) returns (WriteDigitalLinesResponse);
rpc BeginWriteDigitalLines(BeginWriteDigitalLinesRequest) returns (BeginWriteDigitalLinesResponse);
rpc WriteDigitalScalarU32(WriteDigitalScalarU32Request) returns (WriteDigitalScalarU32Response);
rpc BeginWriteDigitalScalarU32(BeginWriteDigitalScalarU32Request) returns (BeginWriteDigitalScalarU32Response);
rpc WriteDigitalU16(WriteDigitalU16Request) returns (WriteDigitalU16Response);
rpc BeginWriteDigitalU16(BeginWriteDigitalU16Request) returns (BeginWriteDigitalU16Response);
rpc WriteDigitalU32(WriteDigitalU32Request) returns (WriteDigitalU32Response);
rpc BeginWriteDigitalU32(BeginWriteDigitalU32Request) returns (BeginWriteDigitalU32Response);
rpc WriteDigitalU8(WriteDigitalU8Request) returns (WriteDigitalU8Response);
rpc BeginWriteDigitalU8(BeginWriteDigitalU8Request) returns (BeginWriteDigitalU8Response);
rpc WriteRaw(WriteRawRequest) returns (WriteRawResponse);
rpc BeginWriteRaw(BeginWriteRawRequest) returns (BeginWriteRawResponse);
rpc WriteToTEDSFromArray(WriteToTEDSFromArrayRequest) returns (WriteToTEDSFromArrayResponse);
rpc WriteToTEDSFromFile(WriteToTEDSFromFileRequest) returns (WriteToTEDSFromFileResponse);
}
Expand Down Expand Up @@ -11033,6 +11042,32 @@ message WriteCtrFreqResponse {
int32 num_samps_per_chan_written = 2;
}

message BeginWriteCtrFreqRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
bool auto_start = 3;
double timeout = 4;
oneof data_layout_enum {
GroupBy data_layout = 5;
int32 data_layout_raw = 6;
}
}

message BeginWriteCtrFreqResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteCtrFreqRequest {
repeated double frequency = 1;
repeated double duty_cycle = 2;
}

message MonikerWriteCtrFreqResponse {
int32 status = 1;
int32 num_samps_per_chan_written = 2;
}

message WriteCtrFreqScalarRequest {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
Expand All @@ -11045,6 +11080,26 @@ message WriteCtrFreqScalarResponse {
int32 status = 1;
}

message BeginWriteCtrFreqScalarRequest {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
double timeout = 3;
}

message BeginWriteCtrFreqScalarResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteCtrFreqScalarRequest {
double frequency = 1;
double duty_cycle = 2;
}

message MonikerWriteCtrFreqScalarResponse {
int32 status = 1;
}

message WriteCtrTicksRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
Expand All @@ -11063,6 +11118,32 @@ message WriteCtrTicksResponse {
int32 num_samps_per_chan_written = 2;
}

message BeginWriteCtrTicksRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
bool auto_start = 3;
double timeout = 4;
oneof data_layout_enum {
GroupBy data_layout = 5;
int32 data_layout_raw = 6;
}
}

message BeginWriteCtrTicksResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteCtrTicksRequest {
repeated uint32 high_ticks = 1;
repeated uint32 low_ticks = 2;
}

message MonikerWriteCtrTicksResponse {
int32 status = 1;
int32 num_samps_per_chan_written = 2;
}

message WriteCtrTicksScalarRequest {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
Expand All @@ -11075,6 +11156,26 @@ message WriteCtrTicksScalarResponse {
int32 status = 1;
}

message BeginWriteCtrTicksScalarRequest {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
double timeout = 3;
}

message BeginWriteCtrTicksScalarResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteCtrTicksScalarRequest {
uint32 high_ticks = 1;
uint32 low_ticks = 2;
}

message MonikerWriteCtrTicksScalarResponse {
int32 status = 1;
}

message WriteCtrTimeRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
Expand All @@ -11093,6 +11194,32 @@ message WriteCtrTimeResponse {
int32 num_samps_per_chan_written = 2;
}

message BeginWriteCtrTimeRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
bool auto_start = 3;
double timeout = 4;
oneof data_layout_enum {
GroupBy data_layout = 5;
int32 data_layout_raw = 6;
}
}

message BeginWriteCtrTimeResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteCtrTimeRequest {
repeated double high_time = 1;
repeated double low_time = 2;
}

message MonikerWriteCtrTimeResponse {
int32 status = 1;
int32 num_samps_per_chan_written = 2;
}

message WriteCtrTimeScalarRequest {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
Expand All @@ -11105,6 +11232,26 @@ message WriteCtrTimeScalarResponse {
int32 status = 1;
}

message BeginWriteCtrTimeScalarRequest {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
double timeout = 3;
}

message BeginWriteCtrTimeScalarResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteCtrTimeScalarRequest {
double high_time = 1;
double low_time = 2;
}

message MonikerWriteCtrTimeScalarResponse {
int32 status = 1;
}

message WriteDigitalLinesRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
Expand All @@ -11122,6 +11269,31 @@ message WriteDigitalLinesResponse {
int32 samps_per_chan_written = 2;
}

message BeginWriteDigitalLinesRequest {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
bool auto_start = 3;
double timeout = 4;
oneof data_layout_enum {
GroupBy data_layout = 5;
int32 data_layout_raw = 6;
}
}

message BeginWriteDigitalLinesResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteDigitalLinesRequest {
bytes write_array = 1;
}

message MonikerWriteDigitalLinesResponse {
int32 status = 1;
int32 samps_per_chan_written = 2;
}

message WriteDigitalScalarU32Request {
nidevice_grpc.Session task = 1;
bool auto_start = 2;
Expand Down Expand Up @@ -11253,6 +11425,31 @@ message WriteDigitalU8Response {
int32 samps_per_chan_written = 2;
}

message BeginWriteDigitalU8Request {
nidevice_grpc.Session task = 1;
int32 num_samps_per_chan = 2;
bool auto_start = 3;
double timeout = 4;
oneof data_layout_enum {
GroupBy data_layout = 5;
int32 data_layout_raw = 6;
}
}

message BeginWriteDigitalU8Response {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteDigitalU8Request {
bytes write_array = 1;
}

message MonikerWriteDigitalU8Response {
int32 status = 1;
int32 samps_per_chan_written = 2;
}

message WriteRawRequest {
nidevice_grpc.Session task = 1;
int32 num_samps = 2;
Expand All @@ -11266,6 +11463,27 @@ message WriteRawResponse {
int32 samps_per_chan_written = 2;
}

message BeginWriteRawRequest {
nidevice_grpc.Session task = 1;
int32 num_samps = 2;
bool auto_start = 3;
double timeout = 4;
}

message BeginWriteRawResponse {
int32 status = 1;
ni.data_monikers.Moniker moniker = 2;
}

message MonikerWriteRawRequest {
bytes write_array = 1;
}

message MonikerWriteRawResponse {
int32 status = 1;
int32 samps_per_chan_written = 2;
}

message WriteToTEDSFromArrayRequest {
string physical_channel = 1;
bytes bit_stream = 2;
Expand Down
Loading
Loading