decoder: Add new decoders: ascii, date, time

[apps/agl-service-can-low-level.git] / low-can-binding / can / can-bus.cpp

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index cbe3cda..f6b5add 100644 (file)
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -181,9 +181,7 @@ void can_bus_t::can_decode_message()
                                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
                                map_subscription& s = sm.get_subscribed_signals();
                                if(application_t::instance().get_diagnostic_manager().is_diagnostic_response(message))
-                               {
                                        process_diagnostic_signals(application_t::instance().get_diagnostic_manager(), message, s);
-                               }
                                else
                                        process_signals(message, s);
                        }
@@ -215,7 +213,7 @@ void can_bus_t::can_event_push()
                                if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
                                {
                                        jo = json_object_new_object();
-                                       jsonify_vehicle(v_message.second, jo);
+                                       jsonify_vehicle(v_message.second, s[v_message.first]->get_signal(), jo);
                                        if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
                                        {
                                                if(v_message.second.has_diagnostic_response)