diff options
| -rw-r--r-- | src/can/can-bus.cpp | 2 | ||||
| -rw-r--r-- | src/configuration-generated.cpp | 4 | ||||
| -rw-r--r-- | src/utils/signals.hpp | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/can/can-bus.cpp b/src/can/can-bus.cpp index dfecea96..ebfd7cec 100644 --- a/src/can/can-bus.cpp +++ b/src/can/can-bus.cpp @@ -74,7 +74,7 @@ int can_bus_t::process_can_signals(can_message_t& can_message) DEBUG(binder_interface, "Operator[] key string: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[std::string(sig.generic_name)])); DEBUG(binder_interface, "Nb elt matched char: %d", (int)s.count(sig.generic_name)); DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.generic_name)));*/ - if( s.find(sig->get_name()) != s.end() && afb_event_is_valid(s[sig->get_name()])) + if( s.find(sig->get_generic_name()) != s.end() && afb_event_is_valid(s[sig->get_generic_name()])) { decoded_message = decoder_t::translateSignal(*sig, can_message, configuration_t::instance().get_can_signals()); diff --git a/src/configuration-generated.cpp b/src/configuration-generated.cpp index 26d65645..be3bc368 100644 --- a/src/configuration-generated.cpp +++ b/src/configuration-generated.cpp @@ -52,8 +52,8 @@ std::vector<std::vector<can_message_definition_t>> CAN_MESSAGES_DEFINITION = { */ std::vector<std::vector<can_signal_t>> SIGNALS = { { - can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][0]), "can.driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::map<int, std::string>(), false, decoder_t::booleanDecoder, nullptr, false), - can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][1]), "can.driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::map<int, std::string>(),false, decoder_t::booleanDecoder, nullptr, false) + can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][0]), "driver_door.open", 2, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::vector<std::string>(), false, decoder_t::booleanDecoder, nullptr, false), + can_signal_t((CAN_MESSAGES_DEFINITION[MESSAGE_SET_ID][1]), "driver_door.close", 0, 4, 1.000000, 0.000000, 0.000000, 0.000000, frequency_clock_t(), false, true, std::vector<std::string>(),false, decoder_t::booleanDecoder, nullptr, false) }, }; diff --git a/src/utils/signals.hpp b/src/utils/signals.hpp index 4675b1f4..00b9e3ed 100644 --- a/src/utils/signals.hpp +++ b/src/utils/signals.hpp @@ -46,6 +46,8 @@ void lookup_signals_by_name(const std::string& key, std::vector<T>& signals, std { 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); } } @@ -55,7 +57,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.get_generic_name().c_str(), FNM_CASEFOLD) == 0) - found_signals_name.push_back(s.get_name()); + found_signals_name.push_back(s.get_generic_name()); + if(::fnmatch(key.c_str(), s.get_name().c_str(), FNM_CASEFOLD) == 0) + found_signals_name.push_back(s.get_generic_name()); } } |