X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=2b04fa8410c94d4e4cb18d41382c50eb9f264f00;hb=11896f4d36c4c5c81cf86e8356eb5b3777272f4b;hp=d1c9ae071f0fe778fa4d5de8f4664c06e5e70a79;hpb=301b33d9bfff4db47a06684ebd7916cdebd63edc;p=apps%2Fagl-service-can-low-level.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index d1c9ae07..2b04fa84 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -18,6 +18,7 @@ #include "low-can-binding.hpp" +#include #include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include "openxc.pb.h" #include "configuration.hpp" @@ -34,7 +34,7 @@ #include "can/can-message.hpp" #include "utils/timer.hpp" #include "utils/signals.hpp" -#include "obd2/obd2-signals.hpp" +#include "diagnostic/diagnostic-message.hpp" #include "utils/openxc-utils.hpp" extern "C" @@ -54,9 +54,9 @@ const struct afb_binding_interface *binder_interface; static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map& s, bool subscribe) { /* Make the subscription or unsubscription to the event */ - if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name.c_str()])) < 0) + if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name])) < 0) { - ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name); + ERROR(binder_interface, "make_subscription_unsubscription: Operation goes wrong for signal: %s", sig_name.c_str()); return 0; } return 1; @@ -68,68 +68,30 @@ static int create_event_handle(const std::string& sig_name, std::mapdaemon, sig_name.c_str()); if (!afb_event_is_valid(s[sig_name])) { - ERROR(binder_interface, "Can't create an event, something goes wrong."); + ERROR(binder_interface, "create_event_handle: Can't create an event for %s, something goes wrong.", sig_name.c_str()); return 0; } return 1; } -static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig, DiagnosticRequest* diag_req, int frequency) -{ - int ret; - sd_event_source *source; - - std::lock_guard subscribed_signals_lock(get_subscribed_signals_mutex()); - std::map& s = get_subscribed_signals(); - if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig])) - { - if(!subscribe) - { - NOTICE(binder_interface, "Event isn't valid, it can't be unsubscribed."); - ret = -1; - } - else - { - /* Event it isn't valid anymore, recreate it */ - sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source, CLOCK_MONOTONIC, frequency, 0, - configuration_t::instance().get_diagnostic_manager().send_request, diag_req); - ret = create_event_handle(sig, s); - } - } - else - { - /* Event doesn't exist , so let's create it */ - struct afb_event empty_event = {nullptr, nullptr}; - subscribed_signals[sig] = empty_event; - ret = create_event_handle(sig, s); - } - - /* Check whether or not the event handler has been correctly created and - * make the subscription/unsubscription operation is so. - */ - if (ret <= 0) - return ret; - return make_subscription_unsubscription(request, sig, s, subscribe); -} - static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, const std::string& sig) { int ret; std::lock_guard subscribed_signals_lock(get_subscribed_signals_mutex()); std::map& s = get_subscribed_signals(); - if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig])) + if (s.find(sig) != s.end()) { - if(!subscribe) + if (!afb_event_is_valid(s[sig]) && !subscribe) { - NOTICE(binder_interface, "Event isn't valid, it can't be unsubscribed."); + NOTICE(binder_interface, "subscribe_unsubscribe_signal: Event isn't valid, it can't be unsubscribed."); ret = -1; } - else + /*else { - /* Event it isn't valid annymore, recreate it */ + // Event it isn't valid annymore, recreate it ret = create_event_handle(sig, s); - } + }*/ } else { @@ -160,32 +122,42 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) { int rets = 0; - //TODO: Implement way to dynamically call the right function no matter + + //TODO: Implement way to dynamically call the right function no matter // how much signals types we have. - const std::string& can_prefix = configuration_t::instance().get_can_signals().front().get_prefix(); - const std::string& obd2_prefix = configuration_t::instance().get_obd2_signals().front().get_prefix(); for(const std::string& sig : signals) { int ret; - if (sig.find_first_of(can_prefix.c_str(), 0, can_prefix.size())) - ret = subscribe_unsubscribe_signal(request, subscribe, sig); - else if (sig.find_first_of(obd2_prefix.c_str(), 0, obd2_prefix.size())) + if (active_diagnostic_request_t::is_diagnostic_signal(sig)) { - std::vector found; - configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found); - int frequency = found.front()->get_frequency(); + std::vector found; + configuration_t::instance().find_diagnostic_messages(build_DynamicField(sig), found); DiagnosticRequest* diag_req = new DiagnosticRequest(found.front()->build_diagnostic_request()); - configuration_t::instance().get_diagnostic_manager().add_recurring_request( - diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, nullptr, (float)frequency); - //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, obd2_signal_t::decode_obd2_response, obd2_signal_t::check_ignition_status, frequency); - ret = subscribe_unsubscribe_signal(request, subscribe, sig, diag_req,frequency); + + // If the requested diagnostic message isn't supported by the car then unssubcribe. + // no matter what we want, worse case will be a fail unsubscription but at least we don't + // poll a PID for nothing. + if(found.front()->get_supported()) + subscribe = false; + if(subscribe) + { + float frequency = found.front()->get_frequency(); + configuration_t::instance().get_diagnostic_manager().add_recurring_request( + diag_req, sig.c_str(), false, found.front()->get_decoder(), found.front()->get_callback(), (float)frequency); + //TODO: Adding callback requesting ignition status: diag_req, sig.c_str(), false, diagnostic_message_t::decode_obd2_response, diagnostic_message_t::check_ignition_status, frequency); + } + else + { + configuration_t::instance().get_diagnostic_manager().cleanup_request( + configuration_t::instance().get_diagnostic_manager().find_recurring_request(diag_req), true); + } } - else - ret = -1; + ret = subscribe_unsubscribe_signal(request, subscribe, sig); if(ret <= 0) return ret; + rets++; DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str()); } @@ -203,7 +175,7 @@ static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, co ret = 0; ret = subscribe_unsubscribe_signals(request, subscribe, signals); - NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size()); + NOTICE(binder_interface, "Subscribed/unsubscribe correctly to %d/%d signal(s).", ret, (int)signals.size()); return ret; } @@ -273,9 +245,9 @@ extern "C" /** * @brief Initialize the binding. - * + * * @param[in] service Structure which represent the Application Framework Binder. - * + * * @return Exit code, zero if success. */ int afbBindingV1ServiceInit(struct afb_service service) @@ -284,14 +256,13 @@ extern "C" /// Initialize CAN socket if(can_bus_manager.init_can_dev() == 0) - { can_bus_manager.start_threads(); - return 0; - } - /// Initialize Diagnostic manager that will handle obd2 requests - diagnostic_manager_t& diag_manager = configuration_t::instance().get_diagnostic_manager(); - diag_manager.initialize(can_bus_manager.get_can_devices().front()); + /// Initialize Diagnostic manager that will handle obd2 requests. + /// We pass by default the first CAN bus device to its Initialization. + /// TODO: be able to choose the CAN bus device that will be use as Diagnostic bus. + if(configuration_t::instance().get_diagnostic_manager().initialize()) + return 0; ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe"); return 1;