Rename some of the classes removing can- prefix

This commit renames files and classes :
	- can_message_definition_t -> message_definition_t
	- can_message_set_t -> message_set_t
	- can_signals_t -> signals_t

This prepares the implementation of j1939 protocol.

Bug-AGL: SPEC-2386

Change-Id: Ie3ee4f25c236c861b92eb12a56fa03a5a9afffbb
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

6 files changed, 20 insertions, 20 deletions

diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp
index 91f66252..b012bbe5 100644
--- a/low-can-binding/can/message/can-message.cpp
+++ b/low-can-binding/can/message/can-message.cpp
@@ -37,7 +37,7 @@ can_message_t::can_message_t()
 can_message_t::can_message_t(uint8_t maxdlen,
 	uint32_t id,
 	uint8_t length,
-	can_message_format_t format,
+	message_format_t format,
 	bool rtr_flag,
 	uint8_t flags,
 	std::vector<uint8_t>& data,
@@ -66,7 +66,7 @@ uint32_t can_message_t::get_id() const
 /// @return True if object correctly initialized and false if not.
 bool can_message_t::is_correct_to_send()
 {
-	if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::INVALID)
+	if (id_ != 0 && length_ != 0 && format_ != message_format_t::INVALID)
 	{
 		int i;
 		for(i=0;i<CAN_MESSAGE_SIZE;i++)
@@ -88,7 +88,7 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca
 {
 	uint8_t maxdlen = 0, length = 0, flags = 0;
 	uint32_t id;
-	can_message_format_t format;
+	message_format_t format;
 	bool rtr_flag;
 	std::vector<uint8_t> data;
 
@@ -109,17 +109,17 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca
 
 	if (frame.can_id & CAN_ERR_FLAG)
 	{
-		format = can_message_format_t::INVALID;
+		format = message_format_t::INVALID;
 		id = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG);
 	}
 	else if (frame.can_id & CAN_EFF_FLAG)
 	{
-		format = can_message_format_t::EXTENDED;
+		format = message_format_t::EXTENDED;
 		id = frame.can_id & CAN_EFF_MASK;
 	}
 	else
 	{
-		format = can_message_format_t::STANDARD;
+		format = message_format_t::STANDARD;
 		id = frame.can_id & CAN_SFF_MASK;
 	}
 
diff --git a/low-can-binding/can/message/can-message.hpp b/low-can-binding/can/message/can-message.hpp
index 5aa302cc..df0d2a19 100644
--- a/low-can-binding/can/message/can-message.hpp
+++ b/low-can-binding/can/message/can-message.hpp
@@ -34,7 +34,7 @@ class can_message_t : public message_t {
 
 	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, uint64_t timestamp);
+		can_message_t(uint8_t maxdlen, uint32_t id, uint8_t length, message_format_t format, bool rtr_flag_, uint8_t flags, std::vector<uint8_t>& data, uint64_t timestamp);
 
 		uint32_t get_id() const;
 
diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp
index 8269cbfa..147ab735 100644
--- a/low-can-binding/can/message/j1939-message.cpp
+++ b/low-can-binding/can/message/j1939-message.cpp
@@ -33,7 +33,7 @@ j1939_message_t::j1939_message_t():
 {}
 
 j1939_message_t::j1939_message_t(uint8_t length,
-    can_message_format_t format,
+    message_format_t format,
     std::vector<uint8_t>& data,
     uint64_t timestamp,
     name_t name,
@@ -86,18 +86,18 @@ uint8_t j1939_message_t::get_addr() const{
 std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct sockaddr_can& addr, uint8_t (&data)[128],size_t nbytes, uint64_t timestamp)
 {
 	uint8_t length = 0;
-	can_message_format_t format;
+	message_format_t format;
 	std::vector<uint8_t> dataVector;
 
     if(nbytes > J1939_MAX_DLEN)
     {
         AFB_DEBUG("Unsupported j1939 frame");
-        format = can_message_format_t::INVALID;
+        format = message_format_t::INVALID;
     }
     else
     {
         AFB_DEBUG("Got a j1939 frame");
-        format = can_message_format_t::J1939;
+        format = message_format_t::J1939;
     }
 
     length = (uint8_t) nbytes;
diff --git a/low-can-binding/can/message/j1939-message.hpp b/low-can-binding/can/message/j1939-message.hpp
index 74b625e0..b0f0b090 100644
--- a/low-can-binding/can/message/j1939-message.hpp
+++ b/low-can-binding/can/message/j1939-message.hpp
@@ -58,7 +58,7 @@ class j1939_message_t : public message_t
 
     public:
         j1939_message_t();
-        j1939_message_t(uint8_t length, can_message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp, name_t name, pgn_t pgn, uint8_t addr);
+        j1939_message_t(uint8_t length, message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp, name_t name, pgn_t pgn, uint8_t addr);
         uint64_t get_name() const;
         uint32_t get_pgn() const;
         uint8_t get_addr() const;
diff --git a/low-can-binding/can/message/message.cpp b/low-can-binding/can/message/message.cpp
index fe37e7ad..2ae095cb 100644
--- a/low-can-binding/can/message/message.cpp
+++ b/low-can-binding/can/message/message.cpp
@@ -28,13 +28,13 @@
 ///
 message_t::message_t()
 	: length_{0},
-	 format_{can_message_format_t::INVALID},
+	 format_{message_format_t::INVALID},
 	 timestamp_{0},
 	 sub_id_{-1}
 {}
 
 message_t::message_t(uint8_t length,
-	can_message_format_t format,
+	message_format_t format,
 	std::vector<uint8_t>& data,
 	uint64_t timestamp)
 	: length_{length},
@@ -90,7 +90,7 @@ uint64_t message_t::get_timestamp() const
 	return timestamp_;
 }
 
-can_message_format_t message_t::get_msg_format()
+message_format_t message_t::get_msg_format()
 {
 	return format_;
 }
diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp
index 6e0daada..e62b6c6b 100644
--- a/low-can-binding/can/message/message.hpp
+++ b/low-can-binding/can/message/message.hpp
@@ -40,10 +40,10 @@ struct bcm_msg
 };
 
 /**
- * @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
@@ -58,7 +58,7 @@ enum class can_message_format_t {
 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.*/
+	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. */
@@ -66,7 +66,7 @@ protected:
 
 public:
 	message_t();
-	message_t(uint8_t length, can_message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp);
+	message_t(uint8_t length, message_format_t format, std::vector<uint8_t>& data, uint64_t timestamp);
 
 	int get_sub_id() const;
 	const uint8_t* get_data() const;
@@ -76,7 +76,7 @@ public:
 
 	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;