X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage%2Fmessage.hpp;h=b77ce8bdc31eee135782e2f287d3ac98d8244701;hb=2dcfd4d0faa9699a4a32af1c39be674dc2856f41;hp=48f4d98b98a1972d3eb05001424f295f7aa6e03e;hpb=22e1fe8db6686ee6ae32cfe58a10aad9f7dfb3a7;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp index 48f4d98b..b77ce8bd 100644 --- a/low-can-binding/can/message/message.hpp +++ b/low-can-binding/can/message/message.hpp @@ -29,19 +29,23 @@ #define CAN_MESSAGE_SIZE 8 #define MAX_BCM_CAN_FRAMES 257 +#define MAX_ISOTP_FRAMES 4096 /** - * @enum message_format_t - * @brief The ID format for a CAN message. + * FLAGS */ -enum class message_format_t { - STANDARD, ///< STANDARD - standard 11-bit CAN arbitration ID. */ - EXTENDED, ///< EXTENDED - an extended frame, with a 29-bit arbitration ID. */ - J1939, ///< J1939 - Format for j1939 messages - INVALID, ///< INVALID - INVALID code used at initialization to signify that it isn't usable'*/ -}; - +#define CAN_PROTOCOL 0x0001 +#define CAN_PROTOCOL_WITH_FD_FRAME 0x0002 +#define J1939_ADDR_CLAIM_PROTOCOL 0x0004 +#define J1939_PROTOCOL 0x0008 +#define ISOTP_PROTOCOL 0x0010 +#define ISOTP_SEND 0x0020 +#define ISOTP_RECEIVE 0x0040 +#define BYTE_FRAME_IS_BIG_ENDIAN 0x0080 +#define BIT_POSITION_REVERSED 0x0100 +#define CONTINENTAL_BIT_POSITION 0x0200 +#define INVALID_FLAG 0x8000 /// @class message_t /// @@ -51,16 +55,14 @@ 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. */ - message_format_t format_; ///< format_ - the format of the message's ID.*/ + uint32_t flags_; ///< format_ - the format mask of the message that control which socketcan will used*/ std::vector 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. */ - - public: message_t(); - message_t(uint32_t maxdlen, uint32_t length, message_format_t format, std::vector& data, uint64_t timestamp); + message_t(uint32_t maxdlen, uint32_t length, uint32_t flags, std::vector& data, uint64_t timestamp); virtual ~message_t() = default; int get_sub_id() const; @@ -69,12 +71,18 @@ public: uint32_t get_length() const; uint64_t get_timestamp() const; - void set_data(std::vector &data); + void set_data(std::vector data); void set_sub_id(int sub_id); void set_timestamp(uint64_t timestamp); - message_format_t get_msg_format(); virtual bool is_set() = 0; virtual std::string get_debug_message() = 0; virtual uint32_t get_id() const = 0; - + virtual void set_id(canid_t id) = 0; + uint32_t get_flags(); + void set_flags(uint32_t flags); + void erase_flags(); + uint32_t get_maxdlen(); + void set_maxdlen(uint32_t maxdlen); + void set_length(uint32_t length); + void frame_swap(); };