X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-set.hpp;h=68fc38596d22251062e0abd0e01d0221430b9d5a;hb=9a3b70076654b41bec0c6c916c940187623de2ad;hp=d54f27ac2f6cd1327c5aa7fb46992c89e5059b0c;hpb=6d6b880b2769add860cb0f135e0f784f8aaf5e00;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message-set.hpp b/low-can-binding/can/message-set.hpp index d54f27ac..68fc3859 100644 --- a/low-can-binding/can/message-set.hpp +++ b/low-can-binding/can/message-set.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015, 2016, 2017 "IoT.bzh" + * Copyright (C) 2015, 2016, 2017, 2018, 2019 "IoT\.bzh" * Author "Romain Forlot" * Author "Loïc Collignon" * @@ -28,8 +28,8 @@ class message_definition_t; class diagnostic_message_t; typedef std::vector> vect_ptr_signal_t; -typedef std::vector> vect_ptr_diag_msg_t; typedef std::vector> vect_ptr_msg_def_t; +typedef std::vector> vect_ptr_diag_msg_t; /// @brief A parent wrapper for a particular set of CAN messages and diagnostic messages /// (e.g. a vehicle or program). @@ -38,17 +38,22 @@ class message_set_t private: uint8_t index_; /// < A numerical ID for the message set, ideally the index is in an array for fast lookup const std::string name_; /// < The name of the message set. - std::vector > messages_definition_; ///< Vector holding all message definitions handled by the message set. + vect_ptr_msg_def_t messages_definition_; ///< Vector holding all message definitions handled by the message set. vect_ptr_diag_msg_t diagnostic_messages_; ///< Vector holding all diagnostics messages from JSON signals description file. First vector map to message set public: message_set_t( uint8_t index, const std::string& name, - const std::vector >& messages_definition, + const vect_ptr_msg_def_t& messages_definition, const vect_ptr_diag_msg_t& diagnostic_messages); + int add_message_definition(std::shared_ptr msg_def); + int add_diagnostic_message(std::shared_ptr diag_msg); + vect_ptr_msg_def_t& get_messages_definition(); vect_ptr_signal_t get_all_signals() const; vect_ptr_diag_msg_t& get_diagnostic_messages(); + + uint8_t get_index() const; };