diff options
Diffstat (limited to 'low-can-binding/can/message-set.hpp')
| -rw-r--r-- | low-can-binding/can/message-set.hpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/low-can-binding/can/message-set.hpp b/low-can-binding/can/message-set.hpp index 4af97fa6..d54f27ac 100644 --- a/low-can-binding/can/message-set.hpp +++ b/low-can-binding/can/message-set.hpp @@ -27,6 +27,10 @@ class signal_t; class message_definition_t; class diagnostic_message_t; +typedef std::vector<std::shared_ptr<signal_t>> vect_ptr_signal_t; +typedef std::vector<std::shared_ptr<diagnostic_message_t>> vect_ptr_diag_msg_t; +typedef std::vector<std::shared_ptr<message_definition_t>> vect_ptr_msg_def_t; + /// @brief A parent wrapper for a particular set of CAN messages and diagnostic messages /// (e.g. a vehicle or program). class message_set_t @@ -35,16 +39,16 @@ 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<std::shared_ptr<message_definition_t> > messages_definition_; ///< Vector holding all message definitions handled by the message set. - std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_messages_; ///< Vector holding all diagnostics messages from JSON signals description file. First vector map to 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<std::shared_ptr<message_definition_t> >& messages_definition, - const std::vector<std::shared_ptr<diagnostic_message_t> >& diagnostic_messages); + const vect_ptr_diag_msg_t& diagnostic_messages); - std::vector<std::shared_ptr<message_definition_t>>& get_messages_definition(); - std::vector<std::shared_ptr<signal_t>> get_all_signals() const; - std::vector<std::shared_ptr<diagnostic_message_t>>& get_diagnostic_messages(); + vect_ptr_msg_def_t& get_messages_definition(); + vect_ptr_signal_t get_all_signals() const; + vect_ptr_diag_msg_t& get_diagnostic_messages(); }; |