diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 15:51:19 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 18:04:58 +0200 |
| commit | 2f60d294b3fa4e243fa67a738f9b82a0b428a7fc (patch) | |
| tree | ed6b50772964ce360eb2a0ebeadac29a8fb9ed2c /low-can-binding/utils | |
| parent | d2180abe18533be7cbe68971a6767e5c2a0ecf6d (diff) | |
Rename some of the classes removing can- prefix
This commit renames files and classes :
- can_message_definition_t -> message_definition_t
- can_message_set_t -> message_set_t
- can_signals_t -> signals_t
This prepares the implementation of j1939 protocol.
Bug-AGL: SPEC-2386
Change-Id: Ie3ee4f25c236c861b92eb12a56fa03a5a9afffbb
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/utils')
| -rw-r--r-- | low-can-binding/utils/signals.cpp | 8 | ||||
| -rw-r--r-- | low-can-binding/utils/signals.hpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/low-can-binding/utils/signals.cpp b/low-can-binding/utils/signals.cpp index 7011fa5a..4895395f 100644 --- a/low-can-binding/utils/signals.cpp +++ b/low-can-binding/utils/signals.cpp @@ -46,7 +46,7 @@ namespace utils /// /// @fn std::vector<std::string> find_signals(const openxc_DynamicField &key) - /// @brief return signals name found searching through CAN_signals and OBD2 pid + /// @brief return signals name found searching through signals and OBD2 pid /// /// @param[in] key : can contain numeric or string value in order to search against /// can signals or obd2 signals name. @@ -60,18 +60,18 @@ namespace utils switch(key.type) { case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING: - lookup_signals_by_name(key.string_value, application_t::instance().get_all_can_signals(), sf.can_signals); + lookup_signals_by_name(key.string_value, application_t::instance().get_all_signals(), sf.signals); lookup_signals_by_name(key.string_value, application_t::instance().get_diagnostic_messages(), sf.diagnostic_messages); break; case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM: - lookup_signals_by_id(key.numeric_value, application_t::instance().get_all_can_signals(), sf.can_signals); + lookup_signals_by_id(key.numeric_value, application_t::instance().get_all_signals(), sf.signals); lookup_signals_by_id(key.numeric_value, application_t::instance().get_diagnostic_messages(), sf.diagnostic_messages); break; default: AFB_ERROR("wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only."); break; } - AFB_DEBUG("Found %d signal(s)", (int)(sf.can_signals.size() + sf.diagnostic_messages.size())); + AFB_DEBUG("Found %d signal(s)", (int)(sf.signals.size() + sf.diagnostic_messages.size())); return sf; } } diff --git a/low-can-binding/utils/signals.hpp b/low-can-binding/utils/signals.hpp index 10cb8ad0..84e81d03 100644 --- a/low-can-binding/utils/signals.hpp +++ b/low-can-binding/utils/signals.hpp @@ -23,7 +23,7 @@ #include "openxc.pb.h" #include "../binding/application.hpp" -#include "../can/can-signals.hpp" +#include "../can/signals.hpp" #include "../diagnostic/diagnostic-message.hpp" #include "../binding/low-can-subscription.hpp" @@ -32,7 +32,7 @@ namespace utils { struct signals_found { - std::vector<std::shared_ptr<can_signal_t> > can_signals; + std::vector<std::shared_ptr<signal_t> > signals; std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages; }; @@ -56,7 +56,7 @@ namespace utils struct signals_found find_signals(const openxc_DynamicField &key); void find_diagnostic_messages(const openxc_DynamicField &key, std::vector<std::shared_ptr<diagnostic_message_t> >& found_signals); - void find_can_signals(const openxc_DynamicField &key, std::vector<std::shared_ptr<can_signal_t> >& found_signals); + void find_signals(const openxc_DynamicField &key, std::vector<std::shared_ptr<signal_t> >& found_signals); template <typename T> void lookup_signals_by_name(const std::string& key, std::vector<std::shared_ptr<T> > signals, std::vector<std::shared_ptr<T> >& found_signals) |