Restore /etc/dev-mapping.conf support

[apps/agl-service-can-low-level.git] / low-can-binding / utils / converter.cpp

diff --git a/low-can-binding/utils/converter.cpp b/low-can-binding/utils/converter.cpp
index c6c2f5e..4c0a3a8 100644 (file)
--- a/low-can-binding/utils/converter.cpp
+++ b/low-can-binding/utils/converter.cpp
@@ -22,22 +22,38 @@
 #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');
+       stream << "0x";
        for(int i = 0; i < length; 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
  *
@@ -55,34 +71,4 @@ void converter_t::signal_to_bits_bytes(unsigned int bit_position, unsigned int b
        new_start_bit = bit_position % CHAR_BIT;
        new_end_byte = (bit_position + bit_size - 1) >> 3;
        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.
- *
- * @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::bit_position_swap(unsigned int msg_length, unsigned int bit_position, unsigned int bit_size)
-{
-       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 - bit_position % CHAR_BIT) - bit_size;
-}
+}
\ No newline at end of file