aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils/signals.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-08 12:55:47 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:39 +0100
commit349c9647be645fbd2e26c67713de648688b4d216 (patch)
tree11152cc1b9c72ef1ec73d8a54f2fd39be78b871f /src/utils/signals.hpp
parent9f6e6be87701898472db48186c767d23cc7b0f0a (diff)
Make a global variable to a configuration object.
With afb interface, it will be the last global variable needed as it regroup all needed stuff to other class and functions. Change-Id: I3d82b6f748ff22a9a975d15ab9df51f63005737f Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/utils/signals.hpp')
-rw-r--r--src/utils/signals.hpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp
index e575bd15..cee5505d 100644
--- a/src/utils/signals.hpp
+++ b/src/utils/signals.hpp
@@ -22,9 +22,12 @@
#include <fnmatch.h>
#include "openxc.pb.h"
+#include "configuration.hpp"
#include "can/can-signals.hpp"
#include "obd2/obd2-signals.hpp"
+#include "low-can-binding.hpp"
+
extern std::mutex subscribed_signals_mutex;
std::mutex& get_subscribed_signals_mutex();
@@ -61,7 +64,7 @@ void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector
{
for(T& s : signals)
{
- if(get_signal_id(s) == key)
+ if(config->get_signal_id(s) == key)
{
found_signals.push_back(&s);
}
@@ -73,7 +76,7 @@ void lookup_signals_by_id(const double key, std::vector<T>& signals, std::vector
{
for(const T& s : signals)
{
- if(get_signal_id(s) == key)
+ if(config->get_signal_id(s) == key)
{
found_signals_name.push_back(s.generic_name);
}