diff options
Diffstat (limited to 'low-can-binding/can/message')
| -rw-r--r-- | low-can-binding/can/message/can-message.cpp | 2 | ||||
| -rw-r--r-- | low-can-binding/can/message/message.hpp | 18 |
2 files changed, 8 insertions, 12 deletions
diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp index b274206b..1f73c27e 100644 --- a/low-can-binding/can/message/can-message.cpp +++ b/low-can-binding/can/message/can-message.cpp @@ -114,12 +114,10 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca } else if (frame.can_id & CAN_EFF_FLAG) { - flags = flags|EXTENDED_ID; id = frame.can_id & CAN_EFF_MASK; } else { - flags = flags|STANDARD_ID; id = frame.can_id & CAN_SFF_MASK; } diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp index db06eb38..1a31a8d4 100644 --- a/low-can-binding/can/message/message.hpp +++ b/low-can-binding/can/message/message.hpp @@ -37,15 +37,13 @@ */ #define INVALID_FLAG 0x0001 -#define STANDARD_ID 0x0002 -#define EXTENDED_ID 0x0004 -#define BCM_PROTOCOL 0x0008 -#define J1939_PROTOCOL 0x0010 -#define J1939_ADDR_CLAIM_PROTOCOL 0x0020 -#define ISOTP_PROTOCOL 0x0040 -#define ISOTP_SEND 0x0080 -#define ISOTP_RECEIVE 0x0100 -#define FD_FRAME 0x0800 +#define BCM_PROTOCOL 0x0002 +#define J1939_PROTOCOL 0x0004 +#define J1939_ADDR_CLAIM_PROTOCOL 0x0008 +#define ISOTP_PROTOCOL 0x0010 +#define ISOTP_SEND 0x0020 +#define ISOTP_RECEIVE 0x0040 +#define FD_FRAME 0x0080 /// @class message_t /// @@ -55,7 +53,7 @@ class message_t { protected: uint32_t maxdlen_; ///< maxdlen_ - Max data length deduce from number of bytes read from the socket.*/ uint32_t length_; ///< length_ - the length of the data array. */ - uint32_t flags_; ///< format_ - the format mask of the message*/ + uint32_t flags_; ///< format_ - the format mask of the message that control which socketcan will used*/ std::vector<uint8_t> data_; ///< data_ - The message's data field with a size of 8 which is the standard about CAN bus messages.*/ uint64_t timestamp_; ///< timestamp_ - timestamp of the received message*/ int sub_id_; ///< sub_id_ - Subscription index. */ |