X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=23ab2da75a73af7d19493859ba67a39295bb63a0;hb=228220efbde99b38ff29a9f58f59ba5c62aedfe6;hp=11a310b22bceed3d5f99ef2ea6ca06a0d7587cd6;hpb=217690559c27646c7e412aaeacfa2064a9e7e6e4;p=apps%2Fagl-service-can-low-level.git diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp index 11a310b2..23ab2da7 100644 --- a/src/low-can-binding.cpp +++ b/src/low-can-binding.cpp @@ -22,40 +22,39 @@ #include #include #include -#include +#include #include #include #include -#include "timer.hpp" #include "openxc.pb.h" -#include "can-bus.hpp" -#include "can-signals.hpp" -#include "can-message.hpp" -#include "openxc-utils.hpp" +#include "configuration.hpp" +#include "can/can-bus.hpp" +#include "can/can-signals.hpp" +#include "can/can-message.hpp" +#include "utils/timer.hpp" +#include "utils/signals.hpp" +#include "obd2/obd2-signals.hpp" +#include "utils/openxc-utils.hpp" extern "C" { #include }; -/* - * Interface between the daemon and the binding - */ +// Interface between the daemon and the binding const struct afb_binding_interface *binder_interface; -can_bus_t *can_bus_handler; - /******************************************************************************** * * Subscription and unsubscription * *********************************************************************************/ -static int make_subscription_unsubscription(struct afb_req request, const char* sig_name, std::map& s, bool subscribe) +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[std::string(sig_name)])) < 0) + if (((subscribe ? afb_req_subscribe : afb_req_unsubscribe)(request, s[sig_name.c_str()])) < 0) { ERROR(binder_interface, "Operation goes wrong for signal: %s", sig_name); return 0; @@ -64,10 +63,10 @@ static int make_subscription_unsubscription(struct afb_req request, const char* } -static int create_event_handle(const char* sig_name, std::map& s) +static int create_event_handle(const std::string& sig_name, std::map& s) { - s[std::string(sig_name)] = afb_daemon_make_event(binder_interface->daemon, sig_name); - if (!afb_event_is_valid(s[std::string(sig_name)])) + s[sig_name] = afb_daemon_make_event(binder_interface->daemon, sig_name.c_str()); + if (!afb_event_is_valid(s[sig_name])) { ERROR(binder_interface, "Can't create an event, something goes wrong."); return 0; @@ -75,13 +74,13 @@ static int create_event_handle(const char* sig_name, std::map subscribed_signals_lock(get_subscribed_signals_mutex()); std::map& s = get_subscribed_signals(); - if (s.find(sig.generic_name) != s.end() && !afb_event_is_valid(s[std::string(sig.generic_name)])) + if (s.find(sig) != s.end() && !afb_event_is_valid(s[sig])) { if(!subscribe) { @@ -89,15 +88,17 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, ret = -1; } else + { /* Event it isn't valid annymore, recreate it */ - ret = create_event_handle(sig.generic_name, s); + ret = create_event_handle(sig, s); + } } else { - /* Event don't exist , so let's create it */ + /* Event doesn't exist , so let's create it */ struct afb_event empty_event = {nullptr, nullptr}; - subscribed_signals[sig.generic_name] = empty_event; - ret = create_event_handle(sig.generic_name, s); + subscribed_signals[sig] = empty_event; + ret = create_event_handle(sig, s); } /* Check whether or not the event handler has been correctly created and @@ -105,70 +106,68 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe, */ if (ret <= 0) return ret; - return make_subscription_unsubscription(request, sig.generic_name, s, 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) + * @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] CanSignal vector with CanSignal to subscribe + * @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) +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. + /// 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 auto& signal_i : signals) + for(const std::string& sig : signals) { - int ret = subscribe_unsubscribe_signal(request, subscribe, signal_i); + int ret; + if (sig.find_first_of(obd2_prefix.c_str(), 0, obd2_prefix.size())) + { + std::vector found; + configuration_t::instance().find_obd2_signals(build_DynamicField(sig), found); + int frequency = found.front()->get_frequency(); + 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, 0, + configuration_t::instance().get_diagnostic_manager().send_request, diag_req); + } + + ret = subscribe_unsubscribe_signal(request, subscribe, sig); if(ret <= 0) return ret; + rets++; - DEBUG(binder_interface, "Signal: %s subscribed", signal_i.generic_name); + DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str()); } return rets; } -// TODO -static int subscribe_unsubscribe_all(struct afb_req request, bool subscribe) -{ - int e = 0; - - //for (const auto& sig : SIGNALS) - // e += !subscribe_unsubscribe_signals(request, subscribe, sig); - e += !subscribe_unsubscribe_signals(request, subscribe, getSignals()); - - return e == 0; -} - static int subscribe_unsubscribe_name(struct afb_req request, bool subscribe, const char *name) { - std::vector sig; + std::vector signals; int ret = 0; - if (!::strcmp(name, "*")) - ret = subscribe_unsubscribe_all(request, subscribe); - else - { - //if(obd2_handler_c.is_obd2_signal(name)) - if(false) - { - // TODO - } - else - { - openxc_DynamicField search_key = build_DynamicField(std::string(name)); - sig = find_can_signals(search_key); - if (sig.empty()) - ret = 0; - } - ret = subscribe_unsubscribe_signals(request, subscribe, sig); - NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)sig.size()); - } + openxc_DynamicField search_key = build_DynamicField(std::string(name)); + signals = find_signals(search_key); + if (signals.empty()) + ret = 0; + + ret = subscribe_unsubscribe_signals(request, subscribe, signals); + NOTICE(binder_interface, "Subscribed correctly to %d/%d signal(s).", ret, (int)signals.size()); + return ret; } @@ -180,7 +179,7 @@ static void subscribe_unsubscribe(struct afb_req request, bool subscribe) /* makes the subscription/unsubscription */ args = afb_req_json(request); if (args == NULL || !json_object_object_get_ex(args, "event", &a)) { - ok = subscribe_unsubscribe_all(request, subscribe); + ok = subscribe_unsubscribe_name(request, subscribe, "*"); } else if (json_object_get_type(a) != json_type_array) { ok = subscribe_unsubscribe_name(request, subscribe, json_object_get_string(a)); } else { @@ -244,18 +243,19 @@ extern "C" */ int afbBindingV1ServiceInit(struct afb_service service) { - int fd_conf; - fd_conf = afb_daemon_rootdir_open_locale(binder_interface->daemon, "can_buses.json", O_RDONLY, NULL); + can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager(); - /* Initialize the CAN bus handler */ - can_bus_handler = new can_bus_t(fd_conf); - - /* Open CAN socket */ - if(can_bus_handler->init_can_dev() == 0) + /// Initialize CAN socket + if(can_bus_manager.init_can_dev() == 0) { - can_bus_handler->start_threads(); + 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()); + ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe"); return 1; }