aboutsummaryrefslogtreecommitdiffstats
path: root/src/can/can-message.hpp
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-03-09 00:43:18 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-03-16 17:10:40 +0100
commit11e909e8a7f8bd5978f0ff231ae6d3dd1dfff2e7 (patch)
tree1eebfd7a115bebd307d507e0f7e68a306c273566 /src/can/can-message.hpp
parent250262eee0cfd5570298f8d69c498adc0688bdc6 (diff)
Fix: method to allocate a new can_message_t object
from a canfd_frame. A new constructor added ad-hoc. Change-Id: Id6b909666105da0c4885351db9291aa430d138f0 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'src/can/can-message.hpp')
-rw-r--r--src/can/can-message.hpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/can/can-message.hpp b/src/can/can-message.hpp
index bdba07ba..0494f5f7 100644
--- a/src/can/can-message.hpp
+++ b/src/can/can-message.hpp
@@ -45,32 +45,32 @@ enum class can_message_format_t {
* buffers.
*/
class can_message_t {
- private:
- uint32_t id_; /*!< id_ - The ID of the message. */
- bool rtr_flag_; /*!< rtr_flag_ - Telling if the frame has RTR flag positionned. Then frame hasn't data field*/
- uint8_t length_; /*!< length_ - the length of the data array (max 8). */
- uint8_t flags_; /*!< flags_ - flags of a CAN FD frame. Needed if we catch FD frames.*/
- can_message_format_t format_; /*!< format_ - the format of the message's ID.*/
- std::vector<uint8_t> data_; /*!< data_ - The message's data field with a size of 8 which is the standard about CAN bus messages.*/
+private:
+ uint8_t maxdlen_; /*!< maxdlen_ - Max data length deduce from number of bytes read from the socket.*/
+ uint32_t id_; /*!< id_ - The ID of the message. */
+ uint8_t length_; /*!< length_ - the length of the data array (max 8). */
+ can_message_format_t format_; /*!< format_ - the format of the message's ID.*/
+ bool rtr_flag_; /*!< rtr_flag_ - Telling if the frame has RTR flag positionned. Then frame hasn't data field*/
+ uint8_t flags_; /*!< flags_ - flags of a CAN FD frame. Needed if we catch FD frames.*/
+ std::vector<uint8_t> data_; /*!< data_ - The message's data field with a size of 8 which is the standard about CAN bus messages.*/
- uint8_t maxdlen_; /*!< maxdlen_ - Max data length deduce from number of bytes read from the socket.*/
+public:
+ can_message_t();
+ can_message_t(uint8_t maxdlen, uint32_t id, uint8_t length, can_message_format_t format, bool rtr_flag_, uint8_t flags, std::vector<uint8_t> data);
- public:
- can_message_t();
-
- uint32_t get_id() const;
- bool get_rtr_flag_() const;
- can_message_format_t get_format() const;
- uint8_t get_flags() const;
- const uint8_t* get_data() const;
- uint8_t get_length() const;
+ uint32_t get_id() const;
+ bool get_rtr_flag_() const;
+ can_message_format_t get_format() const;
+ uint8_t get_flags() const;
+ const uint8_t* get_data() const;
+ uint8_t get_length() const;
- void set_format(const can_message_format_t new_format);
+ void set_format(const can_message_format_t new_format);
- bool is_correct_to_send();
+ bool is_correct_to_send();
- static can_message_t convert_to_canfd_frame(const struct canfd_frame& frame, size_t nbytes);
- canfd_frame convert_to_canfd_frame();
+static can_message_t convert_to_canfd_frame(const struct canfd_frame& frame, size_t nbytes);
+ canfd_frame convert_to_canfd_frame();
};
/**