X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fconverter.cpp;h=6c9cedbb415e866d1a71b8e7688c9cb2b163e817;hb=b6bc89e63ee24c4e5ec1559d7390da90201ff9cd;hp=fad1775721c21ba175822053f2037dac046714bc;hpb=c0c44da0caba438d0b5445e0c15b511170d37eac;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/utils/converter.cpp b/low-can-binding/utils/converter.cpp
index fad17757..6c9cedbb 100644
--- a/low-can-binding/utils/converter.cpp
+++ b/low-can-binding/utils/converter.cpp
@@ -19,24 +19,40 @@
 #include <sstream>
 #include <net/if.h>
 #include <afb/afb-binding>
+#include <climits>
 
 /**
- * @brief Convert hex data to string
+ * @brief Convert data to hex string
  *
  * @param data An array of data
  * @param length The length of the data
- * @return std::string The string data
+ * @return std::string The hex string
  */
 std::string converter_t::to_hex(const uint8_t data[], const size_t length)
 {
 	std::stringstream stream;
 	stream << std::hex << std::setfill('0');
 	for(int i = 0; i < length; i++)
-		stream << std::hex << ((int) data[i]);
+		stream << std::setfill('0') << std::setw(2) << std::hex << ((int) data[i]);
 
 	return stream.str();
 }
 
+/**
+ * @brief Convert data to ascii string
+ *
+ * @param data An array of data
+ * @param length The length of the data
+ * @return std::string The ascii string
+ */
+std::string converter_t::to_ascii(const uint8_t data[], const size_t length)
+{
+	std::stringstream stream;
+	for(int i = 0; i < length; i++)
+		stream << ((char) data[i]);
+	return stream.str();
+}
+
 /**
  * @brief Translate bit_position and bit_size
  *
@@ -51,44 +67,37 @@ std::string converter_t::to_hex(const uint8_t data[], const size_t length)
 void converter_t::signal_to_bits_bytes(unsigned int bit_position, unsigned int bit_size, int &new_start_byte, int &new_end_byte, uint8_t &new_start_bit, uint8_t &new_end_bit)
 {
 	new_start_byte = bit_position >> 3;
-	new_start_bit = bit_position % 8;
+	new_start_bit = bit_position % CHAR_BIT;
 	new_end_byte = (bit_position + bit_size - 1) >> 3;
-	new_end_bit = (bit_position + bit_size - 1) % 8;
+	new_end_bit = (bit_position + bit_size - 1) % CHAR_BIT;
 }
 
 
 /**
- * @brief 	This is to use when you have a big endian CAN frame layout.
- * 		  	It converts the bit position so it matches with little endiant CAN frame layout.
+ * @brief	This is to use when you have a big endian CAN frame layout.
+ * 		It converts the bit position so it matches with little endiant CAN frame layout.
  *
+ * @param msg_length 	Message length in bytes.
  * @param bit_position 	Original bit position.
- * @param bit_size 		Size of the data.
- * @return uint32_t 	New little endian bit position.
+ * @param bit_size	Size of the data.
+ * @return uint32_t 	New bit position.
  */
-uint32_t converter_t::bit_position_swap(uint32_t bit_position,uint32_t bit_size)
+uint32_t converter_t::bit_position_swap(unsigned int msg_length, unsigned int bit_position, unsigned int bit_size)
 {
-	uint32_t start_byte_position = (uint32_t)(bit_position/8);
-	uint32_t bit_size_rest = bit_size;
-
-	if((int)(bit_size-(8 + start_byte_position*8-bit_position%8))>0)
-	{
-		AFB_ERROR("Error: bit_position and bit_size getting out of range");
-		return bit_position;
-	}
-
-	if(bit_size<=8 && ((bit_position+bit_size)%8==bit_size || (bit_position+bit_size)%8==0))
-	{
-		return (uint32_t)(start_byte_position*8 + (8-bit_size));
-	}
-	else
-	{
-		do
-		{
-			bit_size_rest = bit_size_rest - ((start_byte_position+1)*8-bit_position);
-			start_byte_position--;
-			bit_position = start_byte_position*8;
-		} while (bit_size_rest>8);
-		return (uint32_t)(start_byte_position*8 + (8-bit_size_rest));
-	}
+	return (msg_length * CHAR_BIT) - bit_position - bit_size;
+}
 
+/**
+ * @brief	This allow to get the correct bit_position using the weird Continental.
+ *		bit numbering method where the Frame is read using little endianness
+ *		and bit count using a big endianness
+ *
+ * @param msg_length	Message length in bytes.
+ * @param bit_position	Original bit position.
+ * @param bit_size	Size of the data.
+ * @return uint32_t	New bit position.
+ */
+uint32_t converter_t::continental_bit_position_mess(unsigned int msg_length, unsigned int bit_position, unsigned int bit_size)
+{
+	return bit_position + CHAR_BIT - 2 * (bit_position % CHAR_BIT) - bit_size;
 }