Search into generic_name as well as name + prefix, but

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

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 9357490..8ecf742 100644 (file)
--- a/src/low-can-binding.cpp
+++ b/src/low-can-binding.cpp
@@ -22,6 +22,7 @@
 #include <mutex>
 #include <vector>
 #include <thread>
+#include <time.h>
 #include <linux/can.h>
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
@@ -33,6 +34,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"
@@ -40,9 +42,10 @@ extern "C"
        #include <afb/afb-service-itf.h>
 };
 
+#define MICRO 1000000
+
 // Interface between the daemon and the binding
 const struct afb_binding_interface *binder_interface;
-configuration_t *config;
 
 /********************************************************************************
 *
@@ -121,12 +124,31 @@ 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;
+       sd_event_source *source;
+
+       //TODO: Implement way to dynamically call the right function no matter 
+       // how much signals types we have.
 
-       for(auto& sig : signals)
+       for(const std::string& sig : signals)
        {
-               int ret = subscribe_unsubscribe_signal(request, subscribe, sig);
+               int ret;
+               if (active_diagnostic_request_t::is_diagnostic_signal(sig))
+               {
+                       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);
+                       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);
+               }
+
+               ret = subscribe_unsubscribe_signal(request, subscribe, sig);
                if(ret <= 0)
                        return ret;
+
                rets++;
                DEBUG(binder_interface, "Signal: %s subscribed", sig.c_str());
        }
@@ -221,17 +243,20 @@ extern "C"
        */
        int afbBindingV1ServiceInit(struct afb_service service)
        {
-               config = new configuration_t();
+               can_bus_t& can_bus_manager = configuration_t::instance().get_can_bus_manager();
 
-               can_bus_t& can_bus_manager = config->get_can_bus_manager();
-
-               /* Open CAN socket */
+               /// 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.
+               /// 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.
+               configuration_t::instance().get_diagnostic_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;
        }