Search signals against name not generic_name. It's made

[apps/agl-service-can-low-level.git] / src / utils / signals.hpp

diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp
index fe86953..f68f566 100644 (file)
--- a/src/utils/signals.hpp
+++ b/src/utils/signals.hpp
@@ -46,6 +46,8 @@ void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std
        {
                if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0)
                        found_signals.push_back(&s);
+               if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
+                       found_signals.push_back(&s);
        }
 }
 
@@ -55,7 +57,9 @@ void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std
        for(T& s : signals)
        {
                if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0)
-                       found_signals_name.push_back(s.get_generic_name());
+                       found_signals_name.push_back(s.get_name());
+               if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
+                       found_signals_name.push_back(s.get_name());
        }
 }
 
@@ -64,7 +68,7 @@ void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector
 {
        for(T& s : signals)
        {
-               if(config->get_signal_id(s) == key)
+               if(configuration_t::instance().get_signal_id(s) == key)
                {
                        found_signals.push_back(&s);
                }
@@ -76,9 +80,9 @@ void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector
 {
        for(T& s : signals)
        {
-               if(config->get_signal_id(s) == key)
+               if(configuration_t::instance().get_signal_id(s) == key)
                {
-                       found_signals_name.push_back(s.get_generic_name());
+                       found_signals_name.push_back(s.get_name());
                }
        }
 }