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 Read apis which have multiple out params. #1129

Merged
merged 15 commits into from
Nov 27, 2024
Merged

Add codegen support for Daqmx Read apis which have multiple out params. #1129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 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
ae45956
Merge branch 'main' of https://github.com/ni/grpc-device into users/r…
Nov 26, 2024
d3ea52a
merged latest main
Nov 26, 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
324 changes: 290 additions & 34 deletions generated/nidaqmx/nidaqmx.proto
View file
Open in desktop

Large diffs are not rendered by default.

288 changes: 288 additions & 0 deletions generated/nidaqmx/nidaqmx_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8072,6 +8072,34 @@ read_ctr_freq(const StubPtr& stub, const nidevice_grpc::Session& task, const pb:
return response;
}

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

auto request = BeginReadCtrFreqRequest{};
request.mutable_task()->CopyFrom(task);
request.set_num_samps_per_chan(num_samps_per_chan);
request.set_timeout(timeout);
const auto interleaved_ptr = interleaved.get_if<GroupBy>();
const auto interleaved_raw_ptr = interleaved.get_if<pb::int32>();
if (interleaved_ptr) {
request.set_interleaved(*interleaved_ptr);
}
else if (interleaved_raw_ptr) {
request.set_interleaved_raw(*interleaved_raw_ptr);
}
request.set_array_size_in_samps(array_size_in_samps);

auto response = BeginReadCtrFreqResponse{};

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

return response;
}

ReadCtrFreqScalarResponse
read_ctr_freq_scalar(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout)
{
Expand All @@ -8090,6 +8118,24 @@ read_ctr_freq_scalar(const StubPtr& stub, const nidevice_grpc::Session& task, co
return response;
}

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

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

auto response = BeginReadCtrFreqScalarResponse{};

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

return response;
}

ReadCtrTicksResponse
read_ctr_ticks(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& interleaved, const pb::uint32& array_size_in_samps)
{
Expand Down Expand Up @@ -8118,6 +8164,34 @@ read_ctr_ticks(const StubPtr& stub, const nidevice_grpc::Session& task, const pb
return response;
}

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

auto request = BeginReadCtrTicksRequest{};
request.mutable_task()->CopyFrom(task);
request.set_num_samps_per_chan(num_samps_per_chan);
request.set_timeout(timeout);
const auto interleaved_ptr = interleaved.get_if<GroupBy>();
const auto interleaved_raw_ptr = interleaved.get_if<pb::int32>();
if (interleaved_ptr) {
request.set_interleaved(*interleaved_ptr);
}
else if (interleaved_raw_ptr) {
request.set_interleaved_raw(*interleaved_raw_ptr);
}
request.set_array_size_in_samps(array_size_in_samps);

auto response = BeginReadCtrTicksResponse{};

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

return response;
}

ReadCtrTicksScalarResponse
read_ctr_ticks_scalar(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout)
{
Expand All @@ -8136,6 +8210,24 @@ read_ctr_ticks_scalar(const StubPtr& stub, const nidevice_grpc::Session& task, c
return response;
}

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

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

auto response = BeginReadCtrTicksScalarResponse{};

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

return response;
}

ReadCtrTimeResponse
read_ctr_time(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int32& num_samps_per_chan, const double& timeout, const simple_variant<GroupBy, pb::int32>& interleaved, const pb::uint32& array_size_in_samps)
{
Expand Down Expand Up @@ -8164,6 +8256,34 @@ read_ctr_time(const StubPtr& stub, const nidevice_grpc::Session& task, const pb:
return response;
}

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

auto request = BeginReadCtrTimeRequest{};
request.mutable_task()->CopyFrom(task);
request.set_num_samps_per_chan(num_samps_per_chan);
request.set_timeout(timeout);
const auto interleaved_ptr = interleaved.get_if<GroupBy>();
const auto interleaved_raw_ptr = interleaved.get_if<pb::int32>();
if (interleaved_ptr) {
request.set_interleaved(*interleaved_ptr);
}
else if (interleaved_raw_ptr) {
request.set_interleaved_raw(*interleaved_raw_ptr);
}
request.set_array_size_in_samps(array_size_in_samps);

auto response = BeginReadCtrTimeResponse{};

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

return response;
}

ReadCtrTimeScalarResponse
read_ctr_time_scalar(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout)
{
Expand All @@ -8182,6 +8302,24 @@ read_ctr_time_scalar(const StubPtr& stub, const nidevice_grpc::Session& task, co
return response;
}

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

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

auto response = BeginReadCtrTimeScalarResponse{};

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

return response;
}

ReadDigitalLinesResponse
read_digital_lines(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_bytes)
{
Expand Down Expand Up @@ -8210,6 +8348,34 @@ read_digital_lines(const StubPtr& stub, const nidevice_grpc::Session& task, cons
return response;
}

BeginReadDigitalLinesResponse
begin_read_digital_lines(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_bytes)
{
::grpc::ClientContext context;

auto request = BeginReadDigitalLinesRequest{};
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_bytes(array_size_in_bytes);

auto response = BeginReadDigitalLinesResponse{};

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

return response;
}

ReadDigitalScalarU32Response
read_digital_scalar_u32(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout)
{
Expand Down Expand Up @@ -8386,6 +8552,34 @@ read_digital_u8(const StubPtr& stub, const nidevice_grpc::Session& task, const p
return response;
}

BeginReadDigitalU8Response
begin_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)
{
::grpc::ClientContext context;

auto request = BeginReadDigitalU8Request{};
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 = BeginReadDigitalU8Response{};

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

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)
{
Expand Down Expand Up @@ -8414,6 +8608,34 @@ read_power_binary_i16(const StubPtr& stub, const nidevice_grpc::Session& task, c
return response;
}

BeginReadPowerBinaryI16Response
begin_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 = BeginReadPowerBinaryI16Request{};
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 = BeginReadPowerBinaryI16Response{};

raise_if_error(
stub->BeginReadPowerBinaryI16(&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)
{
Expand Down Expand Up @@ -8442,6 +8664,34 @@ read_power_f64(const StubPtr& stub, const nidevice_grpc::Session& task, const pb
return response;
}

BeginReadPowerF64Response
begin_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 = BeginReadPowerF64Request{};
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 = BeginReadPowerF64Response{};

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

return response;
}

ReadPowerScalarF64Response
read_power_scalar_f64(const StubPtr& stub, const nidevice_grpc::Session& task, const double& timeout)
{
Expand All @@ -8460,6 +8710,24 @@ read_power_scalar_f64(const StubPtr& stub, const nidevice_grpc::Session& task, c
return response;
}

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

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

auto response = BeginReadPowerScalarF64Response{};

raise_if_error(
stub->BeginReadPowerScalarF64(&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 All @@ -8480,6 +8748,26 @@ read_raw(const StubPtr& stub, const nidevice_grpc::Session& task, const pb::int3
return response;
}

BeginReadRawResponse
begin_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)
{
::grpc::ClientContext context;

auto request = BeginReadRawRequest{};
request.mutable_task()->CopyFrom(task);
request.set_num_samps_per_chan(num_samps_per_chan);
request.set_timeout(timeout);
request.set_array_size_in_bytes(array_size_in_bytes);

auto response = BeginReadRawResponse{};

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

return response;
}

std::unique_ptr<grpc::ClientReader<RegisterDoneEventResponse>>
register_done_event(const StubPtr& stub, ::grpc::ClientContext& context, const nidevice_grpc::Session& task)
{
Expand Down
Loading
Loading