Smalls improvements

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

diff --git a/low-can-binding/can/can-bus.cpp b/low-can-binding/can/can-bus.cpp
index e9f9fc7..e798618 100644 (file)
--- a/low-can-binding/can/can-bus.cpp
+++ b/low-can-binding/can/can-bus.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015, 2016 "IoT.bzh"
+ * Copyright (C) 2015, 2018 "IoT.bzh"
  * Author "Romain Forlot" <romain.forlot@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,6 +33,16 @@
 #include "../utils/signals.hpp"
 #include "../utils/openxc-utils.hpp"
 
+/// @brief Class destructor
+///
+/// @param[in] conf_file - Stop threads and unlock them to correctly finish them
+/// even without any activity on the CAN bus.
+can_bus_t::~can_bus_t()
+{
+       stop_threads();
+       new_can_message_cv_.notify_one();
+}
+
 /// @brief Class constructor
 ///
 /// @param[in] conf_file - handle to the json configuration file.
@@ -40,10 +50,10 @@ can_bus_t::can_bus_t(utils::config_parser_t conf_file)
        : conf_file_{conf_file}
 {}
 
-/// @brief Take a decoded message to determine if its value comply with the wanted
-/// filtering values.
+/// @brief Take a decoded message to determine if its value complies with the desired
+/// filters.
 ///
-/// @param[in] vehicle_message - A decoded message to analyze
+/// @param[in] vehicle_message - The decoded message to be analyzed.
 /// @param[in] can_subscription - the subscription which will be notified depending
 ///  on its filtering values. Filtering values are stored in the event_filtermember.
 ///
@@ -53,10 +63,10 @@ bool can_bus_t::apply_filter(const openxc_VehicleMessage& vehicle_message, std::
        bool send = false;
        if(is_valid(vehicle_message))
        {
-               float min = std::isnan(can_subscription->get_min()) ? -INFINITY : can_subscription->get_min();
-               float max = std::isnan(can_subscription->get_max()) ? INFINITY : can_subscription->get_max();
+               float min = can_subscription->get_min();
+               float max = can_subscription->get_max();
                double value = get_numerical_from_DynamicField(vehicle_message);
-               send = (value < min && value > max) ? false : true;
+               send = (value < min || value > max) ? false : true;
        }
        return send;
 }
@@ -77,12 +87,12 @@ void can_bus_t::process_can_signals(const can_message_t& can_message, std::map<i
        openxc_DynamicField decoded_message;
        openxc_VehicleMessage vehicle_message;
 
-       // First we have to found which can_signal_t it is
-       std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
-
        if( s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
        {
                bool send = true;
+               // First we have to found which can_signal_t it is
+               std::shared_ptr<low_can_subscription_t> sig = s[subscription_id];
+
                decoded_message = decoder_t::translate_signal(*sig->get_can_signal(), can_message, &send);
                openxc_SimpleMessage s_message = build_SimpleMessage(sig->get_name(), decoded_message);
                vehicle_message = build_VehicleMessage(s_message, can_message.get_timestamp());
@@ -91,7 +101,7 @@ void can_bus_t::process_can_signals(const can_message_t& can_message, std::map<i
                {
                        std::lock_guard<std::mutex> decoded_can_message_lock(decoded_can_message_mutex_);
                        push_new_vehicle_message(subscription_id, vehicle_message);
-                       AFB_DEBUG("%s CAN signals processed.",  sig->get_name().c_str());
+                       AFB_DEBUG("%s CAN signals processed.", sig->get_name().c_str());
                }
        }
 }
@@ -109,6 +119,8 @@ void can_bus_t::process_diagnostic_signals(diagnostic_manager_t& manager, const
        int subscription_id = can_message.get_sub_id();
 
        openxc_VehicleMessage vehicle_message = manager.find_and_decode_adr(can_message);
+       if (can_message.get_timestamp())
+               {vehicle_message.timestamp = can_message.get_timestamp();}
        if( (vehicle_message.has_simple_message && vehicle_message.simple_message.has_name) &&
                s.find(subscription_id) != s.end() && afb_event_is_valid(s[subscription_id]->get_event()))
        {
@@ -156,8 +168,8 @@ void can_bus_t::can_decode_message()
                        }
                        can_message_lock.lock();
                }
-       new_decoded_can_message_.notify_one();
-       can_message_lock.unlock();
+               new_decoded_can_message_.notify_one();
+               can_message_lock.unlock();
        }
 }
 
@@ -165,7 +177,6 @@ void can_bus_t::can_decode_message()
 /// which are events that has to be pushed.
 void can_bus_t::can_event_push()
 {
-       openxc_SimpleMessage s_message;
        json_object* jo;
        utils::signals_manager_t& sm = utils::signals_manager_t::instance();
 
@@ -180,11 +191,10 @@ void can_bus_t::can_event_push()
                        {
                                std::lock_guard<std::mutex> subscribed_signals_lock(sm.get_subscribed_signals_mutex());
                                std::map<int, std::shared_ptr<low_can_subscription_t> >& s = sm.get_subscribed_signals();
-                               s_message = get_simple_message(v_message.second);
                                if(s.find(v_message.first) != s.end() && afb_event_is_valid(s[v_message.first]->get_event()))
                                {
                                        jo = json_object_new_object();
-                                       jsonify_simple(s_message, jo);
+                                       jsonify_vehicle(v_message.second, jo);
                                        if(afb_event_push(s[v_message.first]->get_event(), jo) == 0)
                                        {
                                                if(v_message.second.has_diagnostic_response)