Fix: clear pointer vector before fill it.

[apps/agl-service-can-low-level.git] / src / can-bus.hpp

diff --git a/src/can-bus.hpp b/src/can-bus.hpp
index 8d40ff0..f7cb312 100644 (file)
--- a/src/can-bus.hpp
+++ b/src/can-bus.hpp
@@ -75,12 +75,10 @@ class can_bus_t {
 
                std::condition_variable new_can_message_; /*!< condition_variable use to wait until there is a new CAN message to read*/
                std::mutex can_message_mutex_; /*!< mutex protecting the can_message_q_ queue.*/
-               bool has_can_message_; /*!< boolean members that control whether or not there is can_message into the queue */
                std::queue <can_message_t> can_message_q_; /*!< queue that'll store can_message_t to decoded */
 
                std::condition_variable new_decoded_can_message_; /*!< condition_variable use to wait until there is a new vehicle message to read from the queue vehicle_message_q_*/
                std::mutex decoded_can_message_mutex_;  /*!< mutex protecting the vehicle_message_q_ queue.*/
-               bool has_vehicle_message_; /*!< boolean members that control whether or not there is openxc_VehicleMessage into the queue */
                std::queue <openxc_VehicleMessage> vehicle_message_q_; /*!< queue that'll store openxc_VehicleMessage to pushed */
 
                std::map<std::string, std::shared_ptr<can_bus_dev_t>> can_devices_m_; /*!< Can device map containing all can_bus_dev_t objects initialized during init_can_dev function*/
@@ -169,7 +167,6 @@ class can_bus_t {
                 */
                std::condition_variable& get_new_can_message();
 
-
                /**
                 * @brief Return first openxc_VehicleMessage on the queue 
                 *
@@ -189,7 +186,7 @@ class can_bus_t {
                 *
                 * @return map can_bus_dev_m_ map
                 */
-               std::map<std::string, std::shared_ptr<can_bus_dev_t>> get_can_bus_devices();
+               std::map<std::string, std::shared_ptr<can_bus_dev_t>> get_can_devices();
 };
 
 
@@ -270,7 +267,7 @@ class can_bus_dev_t {
                * @param const struct afb_binding_interface* interface pointer. Used to be able to log 
                *  using application framework logger.
                */
-               canfd_frame read();
+               std::pair<struct canfd_frame&, size_t> read();
                
                /**
                * @brief Send a can message from a can_message_t object.