Uniform indentation with tabulation

[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 0d2320d..a0ca4b2 100644 (file)
--- a/low-can-binding/can/message/j1939-message.cpp
+++ b/low-can-binding/can/message/j1939-message.cpp
@@ -27,10 +27,10 @@
  *
  */
 j1939_message_t::j1939_message_t():
-    message_t(),
-    name_{0},
-    pgn_{0},
-    addr_{0}
+       message_t(),
+       name_{0},
+       pgn_{0},
+       addr_{0}
 {}
 
 /**
@@ -46,17 +46,17 @@ j1939_message_t::j1939_message_t():
  * @param addr The address of the message
  */
 j1939_message_t::j1939_message_t(uint32_t maxdlen,
-    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(maxdlen,length, format, data, timestamp),
-    name_{name},
-    pgn_{pgn},
-    addr_{addr}
+       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(maxdlen,length, format, data, timestamp),
+       name_{name},
+       pgn_{pgn},
+       addr_{addr}
 {}
 
 ///
@@ -65,7 +65,7 @@ j1939_message_t::j1939_message_t(uint32_t maxdlen,
 /// @return name_ class member
 ///
 uint64_t j1939_message_t::get_name() const {
-    return name_;
+       return name_;
 }
 
 ///
@@ -74,7 +74,7 @@ uint64_t j1939_message_t::get_name() const {
 /// @return pgn_ class member
 ///
 uint32_t j1939_message_t::get_pgn() const{
-    return pgn_;
+       return pgn_;
 }
 
 ///
@@ -83,7 +83,7 @@ uint32_t j1939_message_t::get_pgn() const{
 /// @return addr_ class member
 ///
 uint8_t j1939_message_t::get_addr() const{
-    return addr_;
+       return addr_;
 }
 
 /**
@@ -95,13 +95,13 @@ uint8_t j1939_message_t::get_addr() const{
  */
 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();
+       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
@@ -116,39 +116,39 @@ std::string to_hex( uint8_t data[], const size_t length)
 /// @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)
 {
-    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;
-    }
-
-    length = (uint32_t) nbytes;
-    data_vector.reserve(length);
-
-    data_vector.clear();
-
-    std::string data_string;
-    data_string = 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());
-
-    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));
+       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;
+       }
+
+       length = (uint32_t) nbytes;
+       data_vector.reserve(length);
+
+       data_vector.clear();
+
+       std::string data_string;
+       data_string = 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());
+
+       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));
 }
 
 /// @brief Test if members pgn_ and length are set.
@@ -165,12 +165,12 @@ bool j1939_message_t::is_set()
 std::string j1939_message_t::get_debug_message()
 {
        std::string ret = "";
-    ret = ret + "Here is the next j1939 message : pgn " + std::to_string(pgn_)  + " length " + std::to_string(length_) + ", data ";
-    for (size_t i = 0; i < data_.size(); i++)
-    {
-        ret = ret + std::to_string(data_[i]);
-    }
-    return ret;
+       ret = ret + "Here is the next j1939 message : pgn " + std::to_string(pgn_)  + " length " + std::to_string(length_) + ", data ";
+       for (size_t i = 0; i < data_.size(); i++)
+       {
+               ret = ret + std::to_string(data_[i]);
+       }
+       return ret;
 }
 
 ///
@@ -180,7 +180,7 @@ std::string j1939_message_t::get_debug_message()
 ///
 uint32_t j1939_message_t::get_id() const
 {
-    AFB_DEBUG("Prefer method get_pgn() for j1939 messages");
+       AFB_DEBUG("Prefer method get_pgn() for j1939 messages");
        return get_pgn();
 }
 
@@ -191,7 +191,7 @@ uint32_t j1939_message_t::get_id() const
  */
 struct sockaddr_can j1939_message_t::get_sockname()
 {
-    return sockname_;
+       return sockname_;
 }
 
 /**
@@ -201,7 +201,7 @@ struct sockaddr_can j1939_message_t::get_sockname()
  */
 void j1939_message_t::set_sockname(struct sockaddr_can sockname)
 {
-    sockname_ = sockname;
+       sockname_ = sockname;
 }
 
 /**
@@ -213,34 +213,34 @@ void j1939_message_t::set_sockname(struct sockaddr_can sockname)
  */
 void j1939_message_t::set_sockname(pgn_t pgn, name_t name, uint8_t addr)
 {
-    memset(&sockname_, 0, sizeof(sockname_));
-    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;
-    }
+       memset(&sockname_, 0, sizeof(sockname_));
+       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