X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fcan-bus.cpp;h=f6b5add770dbab1005cf34696a8543dcfa609da0;hb=e8c14d2baa8841f13beefaa1fb662a280ea8eb96;hp=cbe3cda7be9ef43efa8f688412c2a3eadc25e64f;hpb=04b7efcdd1a8dfdf461c78d083aabee5445e54bd;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp index cbe3cda7..f6b5add7 100644 --- 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 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)