diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-09 02:28:27 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-16 17:10:40 +0100 |
| commit | fe5a4857985fd00b961c63274e678c8df19feaee (patch) | |
| tree | a965b6d4ff9d0a68912c63af4c5442e5197d152d | |
| parent | 623536b4a10a96a8e71389b741774e645e652e9b (diff) | |
Fix: used new created classes.
Change-Id: Ib0188ac952f64b3bc2203c0310a21de380c75854
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | src/can/can-bus.cpp | 2 | ||||
| -rw-r--r-- | src/utils/signals.cpp | 4 | ||||
| -rw-r--r-- | src/utils/signals.hpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp index ff899e61..93de2a38 100644 --- a/src/can/can-bus.cpp +++ b/src/can/can-bus.cpp @@ -81,7 +81,7 @@ void can_bus_t::can_decode_message() /* First we have to found which can_signal_t it is */ search_key = build_DynamicField((double)can_message.get_id()); signals.clear(); - find_can_signals(search_key, signals); + config->find_can_signals(search_key, signals); /* Decoding the message ! Don't kill the messenger ! */ for(auto& sig : signals) diff --git a/src/utils/signals.cpp b/src/utils/signals.cpp index 9da04f59..6f8847cc 100644 --- a/src/utils/signals.cpp +++ b/src/utils/signals.cpp @@ -60,11 +60,11 @@ std::vector<std::string> find_signals(const openxc_DynamicField &key) switch(key.type) { case openxc_DynamicField_Type::openxc_DynamicField_Type_STRING: - lookup_signals_by_name(key.string_value, get_can_signals(), found_signals_name); + lookup_signals_by_name(key.string_value, config->get_can_signals(), found_signals_name); lookup_signals_by_name(key.string_value, get_obd2_signals(), found_signals_name); break; case openxc_DynamicField_Type::openxc_DynamicField_Type_NUM: - lookup_signals_by_id(key.numeric_value, get_can_signals(), found_signals_name); + lookup_signals_by_id(key.numeric_value, config->get_can_signals(), found_signals_name); lookup_signals_by_id(key.numeric_value, get_obd2_signals(), found_signals_name); break; default: diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp index ed9de83f..6665bb70 100644 --- a/src/utils/signals.hpp +++ b/src/utils/signals.hpp @@ -44,7 +44,7 @@ void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std { for(T& s : signals) { - if(::fnmatch(key.c_str(), s.generic_name, FNM_CASEFOLD) == 0) + if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0) found_signals.push_back(&s); } } @@ -55,7 +55,7 @@ void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std for(const T& s : signals) { if(::fnmatch(key.c_str(), s.generic_name, FNM_CASEFOLD) == 0) - found_signals_name.push_back(s.generic_name); + found_signals_name.push_back(s.get_generic_name()); } } |