X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fbinding%2Fapplication.cpp;h=5e0a6537063f332f7badc0ccb0235dfa06ef1c73;hb=refs%2Fchanges%2F07%2F21407%2F10;hp=8c210177b3de51330a2ac331ef15b52ddc6a46b3;hpb=38f9b3de40b1d1d8e9ed5db0fee40bdaa763d577;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/application.cpp b/low-can-binding/binding/application.cpp
index 8c210177..5e0a6537 100644
--- a/low-can-binding/binding/application.cpp
+++ b/low-can-binding/binding/application.cpp
@@ -14,12 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <ctime>
 
 #include "application.hpp"
 
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
-#include "low-can-socket.hpp"
+#include "low-can-subscription.hpp"
+
+#define MICROSECONDS_IN_SECOND	1000000
+#define ENGINE_VALUE_TIMEOUT	5
 
 /// @brief Return singleton instance of configuration object.
 application_t& application_t::instance()
@@ -33,7 +37,7 @@ can_bus_t& application_t::get_can_bus_manager()
 	return can_bus_manager_;
 }
 
-std::map<std::string, std::shared_ptr<low_can_socket_t> >& application_t::get_can_devices()
+std::map<std::string, std::shared_ptr<low_can_subscription_t> >& application_t::get_can_devices()
 {
 	return can_devices_;
 }
@@ -48,24 +52,24 @@ uint8_t application_t::get_active_message_set() const
 	return active_message_set_;
 }
 
-std::vector<std::shared_ptr<can_message_set_t> > application_t::get_can_message_set()
+std::vector<std::shared_ptr<message_set_t> > application_t::get_message_set()
 {
-	return can_message_set_;
+	return message_set_;
 }
 
-std::vector<std::shared_ptr<can_signal_t> > application_t::get_all_can_signals()
+std::vector<std::shared_ptr<signal_t> > application_t::get_all_signals()
 {
-	return can_message_set_[active_message_set_]->get_all_can_signals();
+	return message_set_[active_message_set_]->get_all_signals();
 }
 
-std::vector<std::shared_ptr<diagnostic_message_t> >& application_t::get_diagnostic_messages()
+std::vector<std::shared_ptr<diagnostic_message_t> > application_t::get_diagnostic_messages()
 {
-	return can_message_set_[active_message_set_]->get_diagnostic_messages();
+	return message_set_[active_message_set_]->get_diagnostic_messages();
 }
 
-std::vector<std::shared_ptr<can_message_definition_t> >& application_t::get_can_message_definition()
+std::vector<std::shared_ptr<message_definition_t>> application_t::get_messages_definition()
 {
-	return can_message_set_[active_message_set_]->get_can_message_definition();
+	return message_set_[active_message_set_]->get_messages_definition();
 }
 
 uint32_t application_t::get_signal_id(diagnostic_message_t& sig) const
@@ -73,7 +77,7 @@ uint32_t application_t::get_signal_id(diagnostic_message_t& sig) const
 	return sig.get_pid();
 }
 
-uint32_t application_t::get_signal_id(can_signal_t& sig) const
+uint32_t application_t::get_signal_id(signal_t& sig) const
 {
 	return sig.get_message()->get_id();
 }
@@ -82,3 +86,54 @@ void application_t::set_active_message_set(uint8_t id)
 {
 	active_message_set_ = id;
 }
+
+bool application_t::isEngineOn()
+{
+	struct utils::signals_found sf;
+	openxc_DynamicField search_key = build_DynamicField("engine.speed");
+	sf = utils::signals_manager_t::instance().find_signals(search_key);
+	bool engine_on = false;
+	uint64_t last_timestamp_in_s;
+
+	if(sf.signals.size() == 1)
+	{
+		last_timestamp_in_s = sf.signals.front()->get_last_value_with_timestamp().second
+						/ MICROSECONDS_IN_SECOND;
+
+		if(sf.signals.front()->get_last_value_with_timestamp().first > 0 &&
+		   std::difftime(std::time(nullptr), last_timestamp_in_s) < ENGINE_VALUE_TIMEOUT)
+		{
+			engine_on = true;
+		}
+		else
+		{
+			AFB_NOTICE("is_engine_on: engine.speed CAN signal found, but engine seems off");
+		}
+	}
+	else
+	{
+		AFB_NOTICE("is_engine_on: Can't identify a useable engine.speed CAN signal");
+	}
+
+	if(sf.diagnostic_messages.size() == 1)
+	{
+		last_timestamp_in_s = sf.diagnostic_messages.front()->get_last_value_with_timestamp().second
+						/ MICROSECONDS_IN_SECOND;
+
+		if(sf.diagnostic_messages.front()->get_last_value_with_timestamp().first > 0 &&
+		   std::difftime(std::time(nullptr), last_timestamp_in_s) < ENGINE_VALUE_TIMEOUT)
+		{
+			engine_on = true;
+		}
+		else
+		{
+			AFB_NOTICE("is_engine_on: engine.speed diagnostic message found, but engine seems off");
+		}
+	}
+	else
+	{
+		AFB_NOTICE("is_engine_on: Can't identify a useable engine.speed diagnostic message");
+	}
+
+	return engine_on;
+}