diff options
author | 2017-05-10 18:39:25 +0200 | |
---|---|---|
committer | 2017-05-10 18:45:56 +0200 | |
commit | d253ada94487232ccd33b68a69fd44ff7840fab7 (patch) | |
tree | 67f5959138d0ddcad413f9ee692d087200e0b4df /CAN-binder/low-can-binding/can/can-message-set.hpp | |
parent | 3e2be4237ac6f3e8bcec8b10d295182cefe67330 (diff) |
Use a tree instead of separated object lists. WIP
Now we respect JSON description file, which is can_message_set contains
can_message_definition which contains can_signals.
Diagnostic messages aren't processed for now.
Change-Id: I94aaf5eded14dd84395bd4fd749df58dee5f533e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'CAN-binder/low-can-binding/can/can-message-set.hpp')
-rw-r--r-- | CAN-binder/low-can-binding/can/can-message-set.hpp | 12 |
1 files changed, 11 insertions, 1 deletions
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 94e2d8d..3d917c1 100644 --- a/CAN-binder/low-can-binding/can/can-message-set.hpp +++ b/CAN-binder/low-can-binding/can/can-message-set.hpp @@ -20,6 +20,12 @@ #include <cstdint> #include <string> +#include <vector> +#include <memory> + +#include "can-message-definition.hpp" + +class can_signal_t; /// @brief A parent wrapper for a particular set of CAN messages and associated /// CAN buses(e.g. a vehicle or program). @@ -33,6 +39,7 @@ private: uint16_t can_signal_count_; /// < The number of CAN signals (across all messages) defined for this message set. uint16_t can_command_count_; /// < The number of CanCommmands defined for this message set. uint16_t obd2_signal_count_; /// < The number of obd2 signals defined for this message set. + std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition_; ///< Vector holding all message definition handled by this message set. public: can_message_set_t( @@ -42,6 +49,9 @@ public: short unsigned int can_message_count, short unsigned int can_signal_count, short unsigned int can_command_count, - short unsigned int obd2_signal_count); + short unsigned int obd2_signal_count, + std::vector<std::shared_ptr<can_message_definition_t> > can_messages_definition); + std::vector<std::shared_ptr<can_message_definition_t> > get_can_message_definition(); + std::vector<std::shared_ptr<can_signal_t> > get_can_signals() const; }; |