From 349c9647be645fbd2e26c67713de648688b4d216 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 8 Mar 2017 12:55:47 +0100 Subject: 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 --- src/utils/signals.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/utils') 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 #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& 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& 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); } -- cgit 1.2.3-korg