diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-03-03 15:12:17 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-03-03 15:12:17 +0100 |
| commit | 217690559c27646c7e412aaeacfa2064a9e7e6e4 (patch) | |
| tree | 9eb275e2442a542940e4b73218916369699db626 /src/can-bus.cpp | |
| parent | 2e8e455644720437d32b0377a7a1697d96655727 (diff) | |
change all genericName to generic_name. Now all
objects use the same variable name
Change-Id: I8a232bc8fd7e580bd8088e6b2ae7a90666ef9c62
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can-bus.cpp')
| -rw-r--r-- | src/can-bus.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/can-bus.cpp b/src/can-bus.cpp index f35319a9..652a4bc5 100644 --- a/src/can-bus.cpp +++ b/src/can-bus.cpp @@ -77,15 +77,15 @@ void can_bus_t::can_decode_message() std::map<std::string, struct afb_event>& s = get_subscribed_signals(); /* DEBUG message to make easier debugger STL containers... - DEBUG(binder_interface, "Operator[] key char: %s, event valid? %d", sig.genericName, afb_event_is_valid(s[sig.genericName])); - DEBUG(binder_interface, "Operator[] key string: %s, event valid? %d", sig.genericName, afb_event_is_valid(s[std::string(sig.genericName)])); - DEBUG(binder_interface, "Nb elt matched char: %d", (int)s.count(sig.genericName)); - DEBUG(binder_interface, "Nb elt matched string: %d", (int)s.count(std::string(sig.genericName))); */ - if( s.find(sig.genericName) != s.end() && afb_event_is_valid(s[sig.genericName])) + DEBUG(binder_interface, "Operator[] key char: %s, event valid? %d", sig.generic_name, afb_event_is_valid(s[sig.generic_name])); + 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.generic_name) != s.end() && afb_event_is_valid(s[sig.generic_name])) { decoded_message = decoder.translateSignal(sig, can_message, getSignals()); - openxc_SimpleMessage s_message = build_SimpleMessage(sig.genericName, decoded_message); + openxc_SimpleMessage s_message = build_SimpleMessage(sig.generic_name, decoded_message); vehicle_message = build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type::openxc_DynamicField_Type_NUM, s_message); std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_); |