X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fconverter.cpp;h=1d7abde785b21aac12f25c80c1bf15eaa23a378b;hb=cc22c89b2362f14e18d8d8ef2b736800592cfd1a;hp=5cfc8f5c633ef5e3b44ff295a543f657b8538bdc;hpb=3d8c0459bcfde576581246b6d2e0e0d5595ac638;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 5cfc8f5c..1d7abde7 100644
--- a/low-can-binding/utils/converter.cpp
+++ b/low-can-binding/utils/converter.cpp
@@ -32,9 +32,8 @@ 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();
 }
 
@@ -49,10 +48,47 @@ std::string converter_t::to_hex(const uint8_t data[], const size_t length)
  * @param new_start_bit The first bit of the signal in the frame
  * @param new_end_bit The last bit of the signal in the frame
  */
-void converter_t::signal_to_bits_bytes(uint32_t bit_position, uint32_t bit_size, int &new_start_byte, int &new_end_byte, int &new_start_bit, int &new_end_bit)
+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_end_byte = (bit_position + bit_size - 1) >> 3;
 	new_end_bit = (bit_position + bit_size - 1) % 8;
-}
\ No newline at end of file
+}
+
+
+/**
+ * @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.
+ */
+uint32_t converter_t::bit_position_swap(uint32_t bit_position,uint32_t 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));
+	}
+
+}