X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Futils%2Fconverter.cpp;fp=low-can-binding%2Futils%2Fconverter.cpp;h=e3db7f338120bad3b9cc80e8ecee2236651020da;hb=64691cf96f9c4d7ff59dbd49e1fe01d26c1a00f6;hp=5cfc8f5c633ef5e3b44ff295a543f657b8538bdc;hpb=3fb6ac3c3670499bee4ce02ff7813739017e8b8f;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..e3db7f33 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]); - } + return stream.str(); } @@ -49,10 +48,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, int &new_start_bit, int &new_end_bit) +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) { 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 +}