X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-message-set.hpp;h=c763de6da7044c76f37477db22e0bc8013f803f4;hb=7747851ca010a3dfe9ffee808376dd5a7af68b91;hp=9555d005abd87a665063042e9c0b34d25f7168c3;hpb=22d0b16875926bdb0a39aa44de2bdde57825127c;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/can/can-message-set.hpp b/CAN-binder/low-can-binding/can/can-message-set.hpp index 9555d005..c763de6d 100644 --- a/CAN-binder/low-can-binding/can/can-message-set.hpp +++ b/CAN-binder/low-can-binding/can/can-message-set.hpp @@ -23,9 +23,9 @@ #include #include -#include "can-message-definition.hpp" - class can_signal_t; +class can_message_definition_t; +class diagnostic_message_t; /// @brief A parent wrapper for a particular set of CAN messages and associated /// CAN buses(e.g. a vehicle or program). @@ -35,13 +35,16 @@ private: uint8_t index_; /// < A numerical ID for the message set, ideally the index in an array for fast lookup const std::string name_; /// < The name of the message set. std::vector > can_messages_definition_; ///< Vector holding all message definition handled by this message set. + std::vector > diagnostic_messages_; ///< Vector holding all diagnostics messages from JSON signals description file. First vector map to message set public: can_message_set_t( uint8_t index, const std::string& name, - std::vector > can_messages_definition); + const std::vector >& can_messages_definition, + const std::vector >& diagnostic_messages); - std::vector > get_can_message_definition(); - std::vector > get_can_signals() const; + std::vector >& get_can_message_definition(); + std::vector > get_all_can_signals() const; + std::vector >& get_diagnostic_messages(); };