diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2019-11-10 19:17:18 +0100 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-11-10 19:17:18 +0100 |
commit | afcdb79c4162782ab2a048dd55938d9e959376d9 (patch) | |
tree | 3a83d61766ba28155a7ccf510fafee1f55b744ba /low-can-binding | |
parent | a7ec20ea45fbc38536b95d44645c5bd3031c4a64 (diff) |
can_message: add missing signature due to conflict
Change-Id: Ib705ae7c500bb9d3abc863053943298c87896bd2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding')
-rw-r--r-- | low-can-binding/can/message/can-message.hpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/low-can-binding/can/message/can-message.hpp b/low-can-binding/can/message/can-message.hpp index 96adadbc..d3d8453c 100644 --- a/low-can-binding/can/message/can-message.hpp +++ b/low-can-binding/can/message/can-message.hpp @@ -49,6 +49,7 @@ class can_message_t : public message_t { uint32_t get_id() const; void set_id(const canid_t id); + bool is_correct_to_send(); static std::shared_ptr<can_message_t> convert_from_frame(const canfd_frame& frame, size_t nbytes, uint64_t timestamp); struct canfd_frame convert_to_canfd_frame(); @@ -56,5 +57,7 @@ class can_message_t : public message_t { struct bcm_msg& get_bcm_msg(); void set_bcm_msg(struct bcm_msg bcm_msg); + struct can_frame convert_to_can_frame(); + bool is_set(); std::string get_debug_message(); }; |