Littles comments improvments

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

diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp
index ed9de83..f68f566 100644 (file)
--- a/src/utils/signals.hpp
+++ b/src/utils/signals.hpp
@@ -22,11 +22,11 @@
 #include <fnmatch.h>
 
 #include "openxc.pb.h"
-#include "configuration.hpp"
-#include "can/can-signals.hpp"
-#include "obd2/obd2-signals.hpp"
+#include "../configuration.hpp"
+#include "../can/can-signals.hpp"
+#include "../obd2/obd2-signals.hpp"
 
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
 
 extern std::mutex subscribed_signals_mutex;
 std::mutex& get_subscribed_signals_mutex();
@@ -44,7 +44,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.generic_name, FNM_CASEFOLD) == 0)
+               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);
        }
 }
@@ -52,10 +54,12 @@ void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std
 template <typename T>
 void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std::vector<std::string>& found_signals_name)
 {
-       for(const T& s : signals)
+       for(T& s : signals)
        {
-               if(::fnmatch(key.c_str(), s.generic_name, FNM_CASEFOLD) == 0)
-                       found_signals_name.push_back(s.generic_name);
+               if(::fnmatch(key.c_str(), s.get_generic_name().c_str(), FNM_CASEFOLD) == 0)
+                       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);
                }
@@ -74,11 +78,11 @@ void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector
 template <typename T>
 void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector<std::string>& found_signals_name)
 {
-       for(const T& s : signals)
+       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.generic_name);
+                       found_signals_name.push_back(s.get_name());
                }
        }
 }