All: Make format coherent with the whole project

[apps/agl-service-can-low-level.git] / low-can-binding / can / message / message.hpp

diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp
index 6cef018..7f13ac4 100644 (file)
--- a/low-can-binding/can/message/message.hpp
+++ b/low-can-binding/can/message/message.hpp
@@ -29,6 +29,7 @@
 #define CAN_MESSAGE_SIZE 8
 
 #define MAX_BCM_CAN_FRAMES 257
+#define MAX_ISOTP_FRAMES 4096
 
 
 /**
@@ -36,13 +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 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
 ///
@@ -52,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. */
@@ -65,20 +66,21 @@ public:
        int get_sub_id() const;
        const uint8_t* get_data() const;
        const std::vector<uint8_t> get_data_vector() const;
-       const std::vector<uint8_t> get_data_vector(int start,int end) const;
+       const std::vector<uint8_t> get_data_vector(int start, int end) const;
        uint32_t get_length() const;
        uint64_t get_timestamp() const;
 
-       void set_data(std::vector<uint8_t> &data);
+       void set_data(std::vector<uint8_t> data);
        void set_sub_id(int sub_id);
        void set_timestamp(uint64_t timestamp);
        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);
 };