summaryrefslogtreecommitdiffstats
path: root/CAN-binder/low-can-binding/binding
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-19 00:36:30 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-19 14:48:23 +0200
commit53e09a3a8e9ff405ee5936f4765659d3817991e6 (patch)
tree0236e6f5e20e9622e4c30cc5d00fdd1cf6f2c2b9 /CAN-binder/low-can-binding/binding
parent3bc17dd60bfd97e36b12849d4d3a5dd3d093a426 (diff)
Change method name to signify that it is an aggregate.
As can_message_definitions got the exact same name but the one from can_message_set is an aggregate of all can_message_definition. So it is clearer using a different name. Change-Id: Ieb9e4d3291f3dc460eb352d8b8fe5a7cf479e687 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/binding')
-rw-r--r--CAN-binder/low-can-binding/binding/configuration.cpp4
-rw-r--r--CAN-binder/low-can-binding/binding/configuration.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp
index cc2b8f2..4898bdc 100644
--- a/CAN-binder/low-can-binding/binding/configuration.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration.cpp
@@ -47,9 +47,9 @@ const std::vector<std::shared_ptr<can_message_set_t> >& configuration_t::get_can
return can_message_set_;
}
-std::vector<std::shared_ptr<can_signal_t> > configuration_t::get_can_signals()
+std::vector<std::shared_ptr<can_signal_t> > configuration_t::get_all_can_signals()
{
- return can_message_set_[active_message_set_]->get_can_signals();
+ return can_message_set_[active_message_set_]->get_all_can_signals();
}
std::vector<std::shared_ptr<diagnostic_message_t> > configuration_t::get_diagnostic_messages()
diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp
index a3bb189..fd66923 100644
--- a/CAN-binder/low-can-binding/binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/binding/configuration.hpp
@@ -67,7 +67,7 @@ class configuration_t
const std::vector<std::shared_ptr<can_message_set_t> >& get_can_message_set();
- std::vector<std::shared_ptr<can_signal_t> > get_can_signals();
+ std::vector<std::shared_ptr<can_signal_t> > get_all_can_signals();
std::vector<std::shared_ptr<diagnostic_message_t> > get_diagnostic_messages();