#include "openxc.pb.h"
#include "../configuration.hpp"
#include "../can/can-signals.hpp"
-#include "../obd2/obd2-signals.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
#include "../low-can-binding.hpp"
{
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);
}
}
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());
}
}
{
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());
}
}
}