diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-09 02:33:19 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:10:40 +0100 |
| commit | 79cb12807f8a092acd3323d407a4661db9c04a74 (patch) | |
| tree | fad80cbdc40b162d35743c313c8082e8d32ff22a /src/diagnostic | |
| parent | 0ee5e30844ecd1749d6d7c48b8ce8f6573ed91cb (diff) | |
Move some functions to configuration class.
Change-Id: I87b1b6961206ae3848cf6aca367698218fe1523e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/diagnostic')
| -rw-r--r-- | src/diagnostic/diagnostic-message.cpp | 25 | ||||
| -rw-r--r-- | src/diagnostic/diagnostic-message.hpp | 1 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/diagnostic/diagnostic-message.cpp b/src/diagnostic/diagnostic-message.cpp index 76b97996..247917b3 100644 --- a/src/diagnostic/diagnostic-message.cpp +++ b/src/diagnostic/diagnostic-message.cpp @@ -42,30 +42,9 @@ uint32_t obd2_signal_t::get_pid() return (uint32_t)pid_; } -/** - * @fn std::vector<std::string> find_signals(const openxc_DynamicField &key) - * @brief return signals name found searching through CAN_signals and OBD2 pid - * - * @param[in] key - can contain numeric or string value in order to search against - * can signals or obd2 signals name. - * - * @return Vector of signals name found. - */ -void obd2_signal_t::find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals) +std::string& obd2_signal_t::get_generic_name() { - switch(key.type) - { - case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING: - lookup_signals_by_name(key.string_value, get_obd2_signals(), found_signals); - break; - case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM: - lookup_signals_by_id(key.numeric_value, get_obd2_signals(), found_signals); - break; - default: - ERROR(binder_interface, "find_signals: wrong openxc_DynamicField specified. Use openxc_DynamicField_Type_NUM or openxc_DynamicField_Type_STRING type only."); - break; - } - DEBUG(binder_interface, "Found %d signal(s)", (int)found_signals.size()); + return generic_name_; } bool obd2_signal_t::is_obd2_response(can_message_t can_message) diff --git a/src/diagnostic/diagnostic-message.hpp b/src/diagnostic/diagnostic-message.hpp index 33035ff1..9dca770e 100644 --- a/src/diagnostic/diagnostic-message.hpp +++ b/src/diagnostic/diagnostic-message.hpp @@ -83,7 +83,6 @@ class obd2_signal_t { void add_request(int pid); - void find_obd2_signals(const openxc_DynamicField &key, std::vector<obd2_signal_t*>& found_signals); bool is_obd2_response(can_message_t can_message); bool is_obd2_request(DiagnosticRequest *request); |