X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fcan%2Fcan-message.hpp;h=730e9f90087577bb4b9459a809b68e98965e41b9;hb=8871f8ae696035877afcbb3b089fc06219c2ba3a;hp=629fb93c8bce380212daa146d8d72a06cf9ccf92;hpb=78daa605c5abd64054dad9f5fcfee638f8c515e0;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/can/can-message.hpp b/src/can/can-message.hpp
index 629fb93c..730e9f90 100644
--- a/src/can/can-message.hpp
+++ b/src/can/can-message.hpp
@@ -22,7 +22,8 @@
 #include <cstdint>
 #include <linux/can.h>
 
-#include "utils/timer.hpp"
+#include "../utils/timer.hpp"
+#include "can-message-set.hpp"
 
 #define CAN_MESSAGE_SIZE 8
 
@@ -100,27 +101,6 @@ class can_message_definition_t
 		uint32_t get_id() const;
 };
 
-/**
- * @class can_message_set_t
- *
- * @brief A parent wrapper for a particular set of CAN messages and associated
- *	CAN buses(e.g. a vehicle or program).
- */
-class can_message_set_t
-{
-	private:
-		uint8_t index_; /*!<index_ - A numerical ID for the message set, ideally the index in an array
-						*	for fast lookup*/
-		const std::string name_; /*!< name_ - The name of the message set.*/
-		uint8_t can_bus_count_; /*!< can_bus_count_ - The number of CAN buses defined for this message set.*/
-		unsigned short can_message_count_; /*!< can_message_count_ - The number of CAN messages (across all buses) defined for
-										*	this message set.*/
-		unsigned short can_signal_count_; /*!< can_signal_count_ - The number of CAN signals (across all messages) defined for
-									*	this message set.*/
-		unsigned short can_command_count_; /*!< can_command_count_ - The number of CanCommmands defined for this message set.*/
-		unsigned short obd2_signal_count_; /*!< obd2_signal_count_ - The number of obd2 signals defined for this message set.*/
-};
-
 /** Public: Retrive a list of all possible CAN configurations.
  *
  * Returns a pointer to an array of all configurations.