X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fconverter.cpp;h=6392fbdfb02df50a7384b7d59497ed8e6542fdc6;hb=4022a03b70337f6f922e97fb2f77d28058612587;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..6392fbdf 100644
--- a/low-can-binding/utils/converter.cpp
+++ b/low-can-binding/utils/converter.cpp
@@ -32,7 +32,7 @@ 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();
 }
@@ -58,27 +58,31 @@ void converter_t::signal_to_bits_bytes(unsigned int bit_position, unsigned int b
 
 
 /**
- * @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 bit_position 	Original bit position.
  * @param bit_size 		Size of the data.
- * @return uint32_t 	New little endian bit position.
+ * @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;
+	return msg_length - bit_position - bit_size;
+	/*
+	unsigned int start_byte_position = (unsigned int)(bit_position/8);
+	unsigned int bit_size_rest = bit_size;
 
-	if((int)(bit_size-(8 + start_byte_position*8-bit_position%8))>0)
+	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))
+	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));
+		return (unsigned int)(start_byte_position*8 + (8-bit_size));
 	}
 	else
 	{
@@ -88,7 +92,7 @@ uint32_t converter_t::bit_position_swap(uint32_t bit_position,uint32_t bit_size)
 			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 (unsigned int)(start_byte_position*8 + (8-bit_size_rest));
 	}
-
+	*/
 }