X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-cb.cpp;h=bff5c935f9a330aeb658f1faec47e13a775402d3;hb=refs%2Fchanges%2F43%2F13743%2F2;hp=d8365da0cd78d2d4851bfd0a6f891d39db7e185d;hpb=e4e00c65f8b686dd93e68a3226020692a62e1d26;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/low-can-cb.cpp b/low-can-binding/binding/low-can-cb.cpp
index d8365da0..bff5c935 100644
--- a/low-can-binding/binding/low-can-cb.cpp
+++ b/low-can-binding/binding/low-can-cb.cpp
@@ -210,6 +210,9 @@ static int subscribe_unsubscribe_diagnostic_messages(struct afb_req request,
 		// poll a PID for nothing.
 		if(sig->get_supported() && subscribe)
 		{
+			if (!app.isEngineOn())
+				AFB_WARNING("signal: Engine is off, %s won't received responses until it's on",  sig->get_name().c_str());
+
 			diag_m.add_recurring_request(diag_req, sig->get_name().c_str(), false, sig->get_decoder(), sig->get_callback(), event_filter.frequency, perm_rec_diag_req);
 			if(can_subscription->create_rx_filter(sig) < 0)
 				{return -1;}
@@ -651,6 +654,7 @@ void list(struct afb_req request)
 /// @return Exit code, zero if success.
 int initv2()
 {
+	uint32_t ret = 1;
 	can_bus_t& can_bus_manager = application_t::instance().get_can_bus_manager();
 
 	can_bus_manager.set_can_devices();
@@ -660,8 +664,29 @@ int initv2()
 	/// 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(application_t::instance().get_diagnostic_manager().initialize())
-		return 0;
+		ret = 0;
+
+	// Add a recurring dignostic message request to get engine speed continuously
+	openxc_DynamicField search_key = build_DynamicField("diagnostic_messages.engine.speed");
+	struct utils::signals_found sf = utils::signals_manager_t::instance().find_signals(search_key);
+
+	if(sf.can_signals.empty() && sf.diagnostic_messages.size() == 1)
+	{
+		struct afb_req request;
+		request.itf = nullptr;
+		request.closure = nullptr;
+
+		struct event_filter_t event_filter;
+		event_filter.frequency = sf.diagnostic_messages.front()->get_frequency();
 
-	AFB_ERROR("There was something wrong with CAN device Initialization.");
-	return 1;
+		utils::signals_manager_t& sm = utils::signals_manager_t::instance();
+		std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
+
+		subscribe_unsubscribe_diagnostic_messages(request, true, sf.diagnostic_messages, event_filter, s, true);
+	}
+
+	if(ret)
+		AFB_ERROR("There was something wrong with CAN device Initialization.");
+
+	return ret;
 }