diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-11-10 19:17:18 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2020-01-09 14:40:41 +0100 |
| commit | 9a3b70076654b41bec0c6c916c940187623de2ad (patch) | |
| tree | 9a334ff62b89cb3684b09d01c7e52962bb8e129d /low-can-binding/can/message | |
| parent | 025a8623df6a6d1f501d932ffa7ec1466dfd488d (diff) | |
can_message: add missing signature due to conflict
Bug-AGL: SPEC-2988
Change-Id: Ib705ae7c500bb9d3abc863053943298c87896bd2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/message')
| -rw-r--r-- | low-can-binding/can/message/can-message.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/low-can-binding/can/message/can-message.hpp b/low-can-binding/can/message/can-message.hpp index 9d501a25..d3d8453c 100644 --- a/low-can-binding/can/message/can-message.hpp +++ b/low-can-binding/can/message/can-message.hpp @@ -49,16 +49,15 @@ 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(); struct std::vector<canfd_frame> convert_to_canfd_frame_vector(); - struct can_frame convert_to_can_frame(); - - bool is_correct_to_send(); - bool is_set(); 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(); }; |