summaryrefslogtreecommitdiffstats
path: root/src/can
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-13 23:07:33 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:15:55 +0100
commit63d31e29e366fb9dd85debc897fdbc91d9cb2e42 (patch)
tree3218c15604ce2e7ec0ceba56368e273512f664da /src/can
parenta0e0cb5ac95e779cd2746d8c1f0740e141bbcc41 (diff)
Search into generic_name as well as name + prefix, but
always register generic_name into subscribed_signals. It will be the output on event and make easier to find the subscribed signals into the map without prefix. Change-Id: Iaf0060bedb54003b0c77121afd2bd35d832dba25 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can')
-rw-r--r--src/can/can-bus.cpp2
1 files changed, 1 insertions, 1 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());