X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-message.hpp;h=1ce1c7a52619a72ceadaef1e1a0c7e5b4f45caec;hb=7747851ca010a3dfe9ffee808376dd5a7af68b91;hp=94847ef4f701858b17c7c6fbcd9fe5bba3beed17;hpb=c4f11994a1540576563819508d4148a0500db4b9;p=apps%2Fagl-service-can-low-level.git

diff --git a/CAN-binder/low-can-binding/can/can-message.hpp b/CAN-binder/low-can-binding/can/can-message.hpp
index 94847ef4..1ce1c7a5 100644
--- a/CAN-binder/low-can-binding/can/can-message.hpp
+++ b/CAN-binder/low-can-binding/can/can-message.hpp
@@ -33,7 +33,7 @@
 enum class can_message_format_t {
 	STANDARD, /*!< STANDARD - standard 11-bit CAN arbitration ID. */
 	EXTENDED, /*!< EXTENDED - an extended frame, with a 29-bit arbitration ID. */
-	ERROR,    /*!< ERROR - ERROR code used at initialization to signify that it isn't usable'*/
+	INVALID,    /*!< INVALID - INVALID code used at initialization to signify that it isn't usable'*/
 };
 
 /**
@@ -51,10 +51,11 @@ private:
 	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.*/
+	uint64_t timestamp_; /*!< timestamp_ - timestamp of the received message*/
 
 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);
+	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, uint64_t timestamp);
 
 	uint32_t get_id() const;
 	bool get_rtr_flag_() const;
@@ -63,13 +64,15 @@ public:
 	const uint8_t* get_data() const;
 	const std::vector<uint8_t> get_data_vector() const;
 	uint8_t get_length() const;
+	uint64_t get_timestamp() const;
 
+	void set_timestamp(uint64_t timestamp);
 	void set_format(const can_message_format_t new_format);
 
 	bool is_correct_to_send();
 
-	static can_message_t convert_from_frame(const canfd_frame& frame, size_t nbytes);
-	static can_message_t convert_from_frame(const can_frame& frame, size_t nbytes);
+	static can_message_t convert_from_frame(const canfd_frame& frame, size_t nbytes, uint64_t timestamp);
+	static can_message_t convert_from_frame(const can_frame& frame, size_t nbytes, uint64_t timestamp);
 
 	struct canfd_frame convert_to_canfd_frame();
 	struct can_frame convert_to_can_frame();