decoder: rework how to swap frame layout.

[apps/agl-service-can-low-level.git] / low-can-binding / can / message / j1939-message.cpp

diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp
index a0ca4b2..743898f 100644 (file)
--- a/low-can-binding/can/message/j1939-message.cpp
+++ b/low-can-binding/can/message/j1939-message.cpp
@@ -16,10 +16,10 @@
  */
 
 #include <cstring>
-#include <sstream>
 #include <iomanip>
 #include <net/if.h>
 #include "../../binding/low-can-hat.hpp"
+#include "../../utils/converter.hpp"
 #include "j1939-message.hpp"
 
 /**
@@ -36,7 +36,6 @@ j1939_message_t::j1939_message_t():
 /**
  * @brief Construct a new j1939 message t::j1939 message t object
  *
- * @param maxdlen The max length of the message
  * @param length The length of the message
  * @param format The format of the message
  * @param data The vector data of the message
@@ -45,15 +44,13 @@ j1939_message_t::j1939_message_t():
  * @param pgn The PGN of the message
  * @param addr The address of the message
  */
-j1939_message_t::j1939_message_t(uint32_t maxdlen,
-       uint32_t length,
-       message_format_t format,
+j1939_message_t::j1939_message_t(uint32_t length,
        std::vector<uint8_t>& data,
        uint64_t timestamp,
        name_t name,
        pgn_t pgn,
        uint8_t addr):
-       message_t(maxdlen,length, format, data, timestamp),
+       message_t(J1939_MAX_DLEN, length, J1939_PROTOCOL, data, timestamp),
        name_{name},
        pgn_{pgn},
        addr_{addr}
@@ -98,9 +95,8 @@ 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();
 }
 
@@ -114,22 +110,16 @@ std::string to_hex( uint8_t data[], const size_t length)
 /// @param[in] timestamp - timestamp of the message
 ///
 /// @return A j1939_message_t object fully initialized with sockaddr_can and data values.
-std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct sockaddr_can& addr, uint8_t (&data)[128],size_t nbytes, uint64_t timestamp)
+std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct sockaddr_can& addr, uint8_t (&data)[128], size_t nbytes, uint64_t timestamp)
 {
        int i;
        uint32_t length = 0;
-       message_format_t format;
        std::vector<uint8_t> data_vector;
 
        if(nbytes > J1939_MAX_DLEN)
        {
                AFB_DEBUG("Unsupported j1939 frame");
-               format = message_format_t::INVALID;
-       }
-       else
-       {
-               //AFB_DEBUG("Got a j1939 frame");
-               format = message_format_t::J1939;
+               return std::make_shared<j1939_message_t>(j1939_message_t());
        }
 
        length = (uint32_t) nbytes;
@@ -138,17 +128,15 @@ std::shared_ptr<j1939_message_t> 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<length;i++)
-       {
                data_vector.push_back(data[i]);
-       };
 
-       AFB_DEBUG("Found pgn: %X, format: %X, length: %X, data %s",
-                                                       addr.can_addr.j1939.pgn, (uint8_t)format, length, data_string.c_str());
+       AFB_DEBUG("Found pgn: %X, length: %X, data %s",
+                  addr.can_addr.j1939.pgn, length, data_string.c_str());
 
-       return std::make_shared<j1939_message_t>(j1939_message_t(J1939_MAX_DLEN,length, format, data_vector, timestamp,addr.can_addr.j1939.name,addr.can_addr.j1939.pgn,addr.can_addr.j1939.addr));
+       return std::make_shared<j1939_message_t>(j1939_message_t(length, data_vector, timestamp, addr.can_addr.j1939.name, addr.can_addr.j1939.pgn, addr.can_addr.j1939.addr));
 }
 
 /// @brief Test if members pgn_ and length are set.
@@ -184,6 +172,12 @@ uint32_t j1939_message_t::get_id() const
        return get_pgn();
 }
 
+void j1939_message_t::set_id(const canid_t id)
+{
+       pgn_ = id;
+}
+
+
 /**
  * @brief Return the sockname of the message
  *
@@ -217,30 +211,10 @@ void j1939_message_t::set_sockname(pgn_t pgn, name_t name, uint8_t addr)
        sockname_.can_family = AF_CAN;
        sockname_.can_ifindex = 0;
 
-       if(addr <= 0 || addr >= UINT8_MAX )
-       {
-               sockname_.can_addr.j1939.addr = J1939_NO_ADDR;
-       }
-       else
-       {
-               sockname_.can_addr.j1939.addr = addr;
-       }
-
-       if(name <= 0 || name >= UINT64_MAX )
-       {
-               sockname_.can_addr.j1939.name = J1939_NO_NAME;
-       }
-       else
-       {
-               sockname_.can_addr.j1939.name = name;
-       }
-
-       if(pgn <= 0 || pgn > J1939_PGN_MAX)
-       {
-               sockname_.can_addr.j1939.pgn = J1939_NO_PGN;
-       }
-       else
-       {
-               sockname_.can_addr.j1939.pgn = pgn;
-       }
-}
\ No newline at end of file
+       sockname_.can_addr.j1939.addr = addr <= 0 || addr >= UINT8_MAX ?
+                                       J1939_NO_ADDR : addr;
+       sockname_.can_addr.j1939.name = name <= 0 || name >= UINT64_MAX ?
+                                       J1939_NO_NAME : name;
+       sockname_.can_addr.j1939.pgn = pgn <= 0 || pgn > J1939_PGN_MAX ?
+                                       J1939_NO_PGN : pgn;
+}