Fix CMakeLists file to get isotp correctly linked and adding

[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 394d906..d1c9ae0 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"
@@ -72,6 +74,44 @@ static int create_event_handle(const std::string& sig_name, std::map<std::string
        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<std::mutex> subscribed_signals_lock(get_subscribed_signals_mutex());
+       std::map<std::string, struct afb_event>& 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;
@@ -120,11 +160,30 @@ 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 
+       // 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 (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()))
+               {
+                       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, diag_req,frequency);
+               }
+               else
+                       ret = -1;
+
                if(ret <= 0)
                        return ret;
                rets++;