Revert accessing CAN device with a map indexing on dev name

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

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 52e893d..074e95c 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -22,9 +22,9 @@
 #include <mutex>
 #include <vector>
 #include <thread>
+#include <time.h>
 #include <linux/can.h>
 #include <json-c/json.h>
-#include <systemd/sd-event.h>
 
 #include "openxc.pb.h"
 #include "configuration.hpp"
@@ -33,6 +33,7 @@
 #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"
@@ -52,9 +53,9 @@ const struct afb_binding_interface *binder_interface;
 static int make_subscription_unsubscription(struct afb_req request, const std::string& sig_name, std::map<std::string, struct afb_event>& 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, "Operation goes wrong for signal: %s", sig_name.c_str());
                return 0;
        }
        return 1;
@@ -66,7 +67,7 @@ static int create_event_handle(const std::string& sig_name, std::map<std::string
        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.");
+               ERROR(binder_interface, "Can't create an event for %s, something goes wrong.", sig_name.c_str());
                return 0;
        }
        return 1;
@@ -120,17 +121,28 @@ 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<std::string>& 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(auto& sig : signals)
+       for(const std::string& sig : signals)
        {
-               //if (sig.find_first_of())
-               int ret = subscribe_unsubscribe_signal(request, subscribe, sig);
+               int ret;
+               if (active_diagnostic_request_t::is_diagnostic_signal(sig) && subscribe)
+               {
+                       std::vector<obd2_signal_t*> 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);
+               }
+
+               ret = subscribe_unsubscribe_signal(request, subscribe, sig);
                if(ret <= 0)
                        return ret;
+
                rets++;
                DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str());
        }
@@ -148,7 +160,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;
 }
@@ -218,9 +230,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)
@@ -229,14 +241,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;