All: Make format coherent with the whole project

[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 2d600a1..3740ea2 100644 (file)
--- a/low-can-binding/can/message/j1939-message.cpp
+++ b/low-can-binding/can/message/j1939-message.cpp
@@ -45,13 +45,12 @@ j1939_message_t::j1939_message_t():
  * @param addr The address of the message
  */
 j1939_message_t::j1939_message_t(uint32_t length,
-       message_format_t format,
        std::vector<uint8_t>& data,
        uint64_t timestamp,
        name_t name,
        pgn_t pgn,
        uint8_t addr):
-       message_t(J1939_MAX_DLEN,length, format, data, timestamp, 0),
+       message_t(J1939_MAX_DLEN, length, J1939_PROTOCOL, data, timestamp),
        name_{name},
        pgn_{pgn},
        addr_{addr}
@@ -95,22 +94,16 @@ uint8_t j1939_message_t::get_addr() const{
 /// @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;
@@ -119,17 +112,17 @@ std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct socka
        data_vector.clear();
 
        std::string data_string;
-       data_string = converter_t::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.
@@ -165,6 +158,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
  *