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

Cleanup in cpp files and remove unused custom_proto files for DAQmx and FPGA. #1133

Merged
merged 1 commit into from
Dec 3, 2024
Merged

Cleanup in cpp files and remove unused custom_proto files for DAQmx and FPGA. #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 0 additions & 35 deletions generated/nidaqmx/nidaqmx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4376,41 +4376,6 @@ enum WriteInt32AttributeValues {
WRITE_INT32_WRITE_RELATIVE_TO_CURR_WRITE_POS = 10430;
}

message DoubleData {
double value = 1;
}

message I32Data {
int32 value = 1;
}

message BoolData {
bool value = 1;
}

message U32Data {
uint32 value = 1;
}

message ArrayDoubleData {
repeated double value = 1;
}

message ArrayI16Data {
repeated int32 value = 1;
}

message ArrayI32Data {
repeated int32 value = 1;
}

message ArrayU16Data {
repeated uint32 value = 1;
}

message ArrayU32Data {
repeated uint32 value = 1;
}
message AnalogPowerUpChannelsAndState {
string channel_names = 1;
double state = 2;
Expand Down
702 changes: 351 additions & 351 deletions generated/nidaqmx/nidaqmx_service.cpp
View file
Open in desktop

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions generated/nifake_non_ivi/nifake_non_ivi_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,15 +327,15 @@ namespace nifake_non_ivi_grpc {
auto valid_enum_value = raw_value_is_valid ? raw_value : 0;
return static_cast<nifake_non_ivi_grpc::MarbleInt32AttributeValues>(valid_enum_value);
};
response->mutable_value()->Clear();
response->mutable_value()->Reserve(10);
std::transform(
response->value_raw().begin(),
response->value_raw().begin() + 10,
google::protobuf::RepeatedFieldBackInserter(response->mutable_value()),
[&](auto x) {
return checked_convert_value(x);
});
response->mutable_value()->Clear();
response->mutable_value()->Reserve(10);
std::transform(
response->value_raw().begin(),
response->value_raw().begin() + 10,
google::protobuf::RepeatedFieldBackInserter(response->mutable_value()),
[&](auto x) {
return checked_convert_value(x);
});
return ::grpc::Status::OK;
}
catch (nidevice_grpc::NonDriverException& ex) {
Expand Down Expand Up @@ -662,33 +662,33 @@ namespace nifake_non_ivi_grpc {
return ConvertApiErrorStatusForFakeHandle(context, status, 0);
}
response->set_status(status);
response->mutable_u16_data()->Clear();
response->mutable_u16_data()->Reserve(number_of_u16_samples);
std::transform(
u16_data.begin(),
u16_data.begin() + number_of_u16_samples,
google::protobuf::RepeatedFieldBackInserter(response->mutable_u16_data()),
[&](auto x) {
return x;
});
response->mutable_i16_data()->Clear();
response->mutable_i16_data()->Reserve(number_of_i16_samples);
std::transform(
i16_data.begin(),
i16_data.begin() + number_of_i16_samples,
google::protobuf::RepeatedFieldBackInserter(response->mutable_i16_data()),
[&](auto x) {
return x;
});
response->mutable_i8_data()->Clear();
response->mutable_i8_data()->Reserve(number_of_i8_samples);
std::transform(
i8_data.begin(),
i8_data.begin() + number_of_i8_samples,
google::protobuf::RepeatedFieldBackInserter(response->mutable_i8_data()),
[&](auto x) {
return x;
});
response->mutable_u16_data()->Clear();
response->mutable_u16_data()->Reserve(number_of_u16_samples);
std::transform(
u16_data.begin(),
u16_data.begin() + number_of_u16_samples,
google::protobuf::RepeatedFieldBackInserter(response->mutable_u16_data()),
[&](auto x) {
return x;
});
response->mutable_i16_data()->Clear();
response->mutable_i16_data()->Reserve(number_of_i16_samples);
std::transform(
i16_data.begin(),
i16_data.begin() + number_of_i16_samples,
google::protobuf::RepeatedFieldBackInserter(response->mutable_i16_data()),
[&](auto x) {
return x;
});
response->mutable_i8_data()->Clear();
response->mutable_i8_data()->Reserve(number_of_i8_samples);
std::transform(
i8_data.begin(),
i8_data.begin() + number_of_i8_samples,
google::protobuf::RepeatedFieldBackInserter(response->mutable_i8_data()),
[&](auto x) {
return x;
});
return ::grpc::Status::OK;
}
catch (nidevice_grpc::NonDriverException& ex) {
Expand Down Expand Up @@ -758,15 +758,15 @@ namespace nifake_non_ivi_grpc {
}
response->set_status(status);
response->mutable_i32_data()->Resize(array_size_copy, 0);
response->mutable_u16_data()->Clear();
response->mutable_u16_data()->Reserve(array_size_copy);
std::transform(
u16_data.begin(),
u16_data.begin() + array_size_copy,
google::protobuf::RepeatedFieldBackInserter(response->mutable_u16_data()),
[&](auto x) {
return x;
});
response->mutable_u16_data()->Clear();
response->mutable_u16_data()->Reserve(array_size_copy);
std::transform(
u16_data.begin(),
u16_data.begin() + array_size_copy,
google::protobuf::RepeatedFieldBackInserter(response->mutable_u16_data()),
[&](auto x) {
return x;
});
return ::grpc::Status::OK;
}
catch (nidevice_grpc::NonDriverException& ex) {
Expand Down
55 changes: 0 additions & 55 deletions generated/nifpga/nifpga.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,61 +244,6 @@ enum RunAttribute {
RUN_ATTRIBUTE_WAIT_UNTIL_DONE = 1;
}

message I32Data {
int32 value = 1;
}

message U32Data {
uint32 value = 1;
}

message I64Data {
int64 value = 1;
}

message U64Data {
uint64 value = 1;
}

message BoolData {
bool value = 1;
}

message FloatData {
float value = 1;
}

message DoubleData {
double value = 1;
}

message ArrayI32Data {
repeated int32 value = 1;
}

message ArrayU32Data {
repeated uint32 value = 1;
}

message ArrayI64Data {
repeated int64 value = 1;
}

message ArrayU64Data {
repeated uint64 value = 1;
}

message ArrayBoolData {
repeated bool value = 1;
}

message ArrayFloatData {
repeated float value = 1;
}

message ArrayDoubleData {
repeated double value = 1;
}
message AbortRequest {
nidevice_grpc.Session session = 1;
}
Expand Down
Loading