From 1ebfa6dc2137bf6cbc487b6efc94ce976cf0ed27 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 26 Nov 2019 16:19:02 +0100 Subject: Update j1939 decode with function to_hex Bug-AGL: SPEC-2386 Bug-AGL: SPEC-2976 Signed-off-by: Arthur Guyader Change-Id: Ia10abfd73a6ea9d42770566e23bc4b206723f081 Signed-off-by: Romain Forlot --- low-can-binding/can/message/j1939-message.cpp | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'low-can-binding') diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp index a0ca4b2a..7dc388b3 100644 --- a/low-can-binding/can/message/j1939-message.cpp +++ b/low-can-binding/can/message/j1939-message.cpp @@ -16,10 +16,10 @@ */ #include -#include #include #include #include "../../binding/low-can-hat.hpp" +#include "../../utils/converter.hpp" #include "j1939-message.hpp" /** @@ -86,23 +86,6 @@ uint8_t j1939_message_t::get_addr() const{ return addr_; } -/** - * @brief Convert hex data to string - * - * @param data An array of data - * @param length The length of the data - * @return std::string The string data - */ -std::string to_hex( 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(); -} /// @brief Take a sockaddr_can struct and array of data to initialize class members /// @@ -138,7 +121,7 @@ std::shared_ptr j1939_message_t::convert_from_addr(struct socka data_vector.clear(); std::string data_string; - data_string = to_hex(data,length); + data_string = converter_t::to_hex(data,length); for(i=0;i