X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flow-can-binding.cpp;h=f60790fc8e629e321da69098fdd6834ac5ee8632;hb=4e2d038c42d6995d69239455ec4fbad9931fcfd5;hp=46dcbf26ac14e252d9783224b343e2ec50308bba;hpb=1ed2a620b5ac6272de01be7f1830715f7f0d280d;p=apps%2Flow-level-can-service.git

diff --git a/src/low-can-binding.cpp b/src/low-can-binding.cpp
index 46dcbf2..f60790f 100644
--- 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"
@@ -42,7 +43,6 @@ extern "C"
 
 // Interface between the daemon and the binding
 const struct afb_binding_interface *binder_interface;
-configuration_t *config;
 
 /********************************************************************************
 *
@@ -53,9 +53,9 @@ configuration_t *config;
 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;
@@ -67,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;
@@ -109,12 +109,12 @@ static int subscribe_unsubscribe_signal(struct afb_req request, bool subscribe,
 }
 
 /**
- * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<CanSignal>& signals)
+ * @fn static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe, const std::vector<can_signal_t>& 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
  */
@@ -122,11 +122,27 @@ static int subscribe_unsubscribe_signals(struct afb_req request, bool subscribe,
 {
 	int rets = 0;
 
-	for(auto& sig : signals)
+	//TODO: Implement way to dynamically call the right function no matter
+	// how much signals types we have.
+
+	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) && 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());
 	}
@@ -144,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;
 }
@@ -214,23 +230,24 @@ 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)
 	{
-		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();
+
+		/// 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;
-		}
 
 		ERROR(binder_interface, "There was something wrong with CAN device Initialization. Check your config file maybe");
 		return 1;