X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=45213d91a178c723091f20f30aec5fd31ed76dea;hb=c0fd6e1982353d056c26a292186ef0df315adde3;hp=f7833d89711727c1b1eae6ee0d06461afeea14a3;hpb=d1282ada6335171914a23c328c8a17c809557e62;p=apps%2Flow-level-can-service.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index f7833d8..45213d9 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" @@ -42,23 +42,21 @@ extern "C" #include }; -#define MICRO 1000000 - // Interface between the daemon and the binding const struct afb_binding_interface *binder_interface; -/******************************************************************************** -* -* Subscription and unsubscription -* -*********************************************************************************/ +///****************************************************************************** +/// +/// Subscription and unsubscription +/// +///*******************************************************************************/ 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; @@ -70,7 +68,7 @@ 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; @@ -82,18 +80,18 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, 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 { @@ -111,20 +109,19 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, return make_subscription_unsubscription(request, sig, s, subscribe); } -/** - * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) - * @brief subscribe to all signals in the vector signals - * - * @param[in] afb_req request : contain original request use to subscribe or unsubscribe - * @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription - * @param[in] can_signal_t vector with can_signal_t to subscribe - * - * @return Number of correctly subscribed signal - */ +/// +/// @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) +/// @brief subscribe to all signals in the vector signals +/// +/// @param[in] afb_req request : contain original request use to subscribe or unsubscribe +/// @param[in] subscribe boolean value used to chose between a subscription operation or an unsubscription +/// @param[in] can_signal_t vector with can_signal_t to subscribe +/// +/// @return Number of correctly subscribed signal +/// static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector& signals) { int rets = 0; - sd_event_source *source; //TODO: Implement way to dynamically call the right function no matter // how much signals types we have. @@ -134,15 +131,28 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, int ret; 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); - sd_event_add_time(afb_daemon_get_event_loop(binder_interface->daemon), &source, CLOCK_MONOTONIC, frequency*MICRO, 0, - configuration_t::instance().get_diagnostic_manager().send_request, diag_req); + + // 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()) + { + 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 + { + found.front()->set_supported(false); + configuration_t::instance().get_diagnostic_manager().cleanup_request( + configuration_t::instance().get_diagnostic_manager().find_recurring_request(diag_req), true); + DEBUG(binder_interface, "Signal: %s isn't supported. Canceling operation.", sig.c_str()); + return -1; + } } ret = subscribe_unsubscribe_signal(request, subscribe, sig); @@ -166,7 +176,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; } @@ -234,26 +244,26 @@ extern "C" return &binding_desc; } - /** - * @brief Initialize the binding. - * - * @param[in] service Structure which represent the Application Framework Binder. - * - * @return Exit code, zero if success. - */ + /// @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) { can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager(); /// Initialize CAN socket if(can_bus_manager.init_can_dev() == 0) + { can_bus_manager.start_threads(); - /// 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(can_bus_manager.get_can_devices().front())) - return 0; + /// 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;