X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage%2Fmessage.hpp;h=48f4d98b98a1972d3eb05001424f295f7aa6e03e;hb=4bc8984b3b1f531e9d43a09317485a301a9f5379;hp=6e0daadaff9b2290403c30130ab0820242e0f409;hpb=d2d2620bbb8f0aad0181e67e9f6affc3d6cb4a51;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 6e0daada..48f4d98b 100644
--- a/low-can-binding/can/message/message.hpp
+++ b/low-can-binding/can/message/message.hpp
@@ -30,20 +30,12 @@
 
 #define MAX_BCM_CAN_FRAMES 257
 
-struct bcm_msg
-{
-	struct bcm_msg_head msg_head;
-	union {
-		struct canfd_frame fd_frames[MAX_BCM_CAN_FRAMES];
-		struct can_frame frames[MAX_BCM_CAN_FRAMES];
-	};
-};
 
 /**
- * @enum can_message_format_t
+ * @enum message_format_t
  * @brief The ID format for a CAN message.
  */
-enum class can_message_format_t {
+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
@@ -57,30 +49,32 @@ enum class can_message_format_t {
 /// buffers. It is a wrapper of a can_frame struct with some sugar around it for binding purposes.
 class message_t {
 protected:
-	uint8_t length_; ///< length_ - the length of the data array (max 8). */
-	can_message_format_t format_; ///< format_ - the format of the message's ID.*/
+	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.*/
 	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. */
 
 
+
 public:
 	message_t();
-	message_t(uint8_t length, can_message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp);
+	message_t(uint32_t maxdlen, uint32_t length, message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp);
+	virtual ~message_t() = default;
 
 	int get_sub_id() const;
 	const uint8_t* get_data() const;
 	const std::vector<uint8_t> get_data_vector() const;
-	uint8_t get_length() const;
+	uint32_t get_length() const;
 	uint64_t get_timestamp() const;
 
+	void set_data(std::vector<uint8_t> &data);
 	void set_sub_id(int sub_id);
 	void set_timestamp(uint64_t timestamp);
-	can_message_format_t get_msg_format();
+	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 struct bcm_msg get_bcm_msg() = 0;
-	virtual void set_bcm_msg(struct bcm_msg bcm_msg) = 0;
 
 };