Fix: used new created classes.

Change-Id: Ib0188ac952f64b3bc2203c0310a21de380c75854
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp
index ff899e6..93de2a3 100644 (file)
--- 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();
                /* 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)
 
                /* 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 9da04f5..6f8847c 100644 (file)
--- 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:
        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_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:
                                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 ed9de83..6665bb7 100644 (file)
--- 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)
        {
 {
        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);
        }
 }
                        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)
        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());

        }
 }
 
        }
 }