diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 15:51:19 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 18:04:58 +0200 |
commit | 2f60d294b3fa4e243fa67a738f9b82a0b428a7fc (patch) | |
tree | ed6b50772964ce360eb2a0ebeadac29a8fb9ed2c /low-can-binding/can/message/can-message.cpp | |
parent | d2180abe18533be7cbe68971a6767e5c2a0ecf6d (diff) |
Rename some of the classes removing can- prefix
This commit renames files and classes :
- can_message_definition_t -> message_definition_t
- can_message_set_t -> message_set_t
- can_signals_t -> signals_t
This prepares the implementation of j1939 protocol.
Bug-AGL: SPEC-2386
Change-Id: Ie3ee4f25c236c861b92eb12a56fa03a5a9afffbb
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/message/can-message.cpp')
-rw-r--r-- | low-can-binding/can/message/can-message.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp index 91f66252..b012bbe5 100644 --- a/low-can-binding/can/message/can-message.cpp +++ b/low-can-binding/can/message/can-message.cpp @@ -37,7 +37,7 @@ can_message_t::can_message_t() can_message_t::can_message_t(uint8_t maxdlen, uint32_t id, uint8_t length, - can_message_format_t format, + message_format_t format, bool rtr_flag, uint8_t flags, std::vector<uint8_t>& data, @@ -66,7 +66,7 @@ uint32_t can_message_t::get_id() const /// @return True if object correctly initialized and false if not. bool can_message_t::is_correct_to_send() { - if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::INVALID) + if (id_ != 0 && length_ != 0 && format_ != message_format_t::INVALID) { int i; for(i=0;i<CAN_MESSAGE_SIZE;i++) @@ -88,7 +88,7 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca { uint8_t maxdlen = 0, length = 0, flags = 0; uint32_t id; - can_message_format_t format; + message_format_t format; bool rtr_flag; std::vector<uint8_t> data; @@ -109,17 +109,17 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca if (frame.can_id & CAN_ERR_FLAG) { - format = can_message_format_t::INVALID; + format = message_format_t::INVALID; id = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG); } else if (frame.can_id & CAN_EFF_FLAG) { - format = can_message_format_t::EXTENDED; + format = message_format_t::EXTENDED; id = frame.can_id & CAN_EFF_MASK; } else { - format = can_message_format_t::STANDARD; + format = message_format_t::STANDARD; id = frame.can_id & CAN_SFF_MASK; } |