Skip to content

Commit

Permalink
Updated Us4rSettings protobuf to use camel_case format.
Browse files Browse the repository at this point in the history
  • Loading branch information
pjarosik committed Mar 4, 2022
1 parent 85889d8 commit 79c9515
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arrus/core/io/proto/devices/us4r/Us4RSettings.proto
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ message Us4RSettings {
oneof optional_nus4ems {
uint32 nus4oems = 12;
}
repeated uint32 adapterToUs4RModuleNr = 13;
repeated uint32 adapter_to_us4r_module_nr = 13;
}
4 changes: 2 additions & 2 deletions arrus/core/io/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ Us4RSettings readUs4RSettings(const proto::Us4RSettings &us4r,
if(us4r.optional_nus4ems_case() != proto::Us4RSettings::OPTIONAL_NUS4EMS_NOT_SET) {
nUs4OEMs = static_cast<Ordinal>(us4r.nus4oems());
}
if(!us4r.adaptertous4rmodulenr().empty()) {
auto &adapter2Us4RModule = us4r.adaptertous4rmodulenr();
if(!us4r.adapter_to_us4r_module_nr().empty()) {
auto &adapter2Us4RModule = us4r.adapter_to_us4r_module_nr();
for(auto &nr: adapter2Us4RModule) {
adapterToUs4RModuleNr.emplace_back(static_cast<Ordinal>(nr));
}
Expand Down
2 changes: 1 addition & 1 deletion arrus/core/io/test-data/us4r.prototxt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ us4r: {
{}
]
nus4oems: 2
adapterToUs4RModuleNr: [1, 0]
adapter_to_us4r_module_nr: [1, 0]
}


0 comments on commit 79c9515

Please sign in to comment.