#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 "../diagnostic/diagnostic-message.hpp"
-#include "low-can-binding.hpp"
+#include "../low-can-binding.hpp"
extern std::mutex subscribed_signals_mutex;
std::mutex& get_subscribed_signals_mutex();
/**
* @brief return the subscribed_signals map.
*
- * return std::map<std::string, struct afb_event> - map of subscribed signals.
+ * return Map of subscribed signals.
*/
extern std::map<std::string, struct afb_event> subscribed_signals;
std::map<std::string, struct afb_event>& get_subscribed_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);
+ if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0)
found_signals.push_back(&s);
}
}
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());
}
}
{
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);
}
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());
}
}
}