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 e3db7f3..4c0a3a8 100644 (file)
--- a/low-can-binding/utils/converter.cpp
+++ b/low-can-binding/utils/converter.cpp
@@ -19,24 +19,41 @@
 #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');
+       stream << "0x";
        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
  *
@@ -48,10 +65,10 @@ 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, uint8_t &new_start_bit, uint8_t &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_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;
+}
\ No newline at end of file