all: format

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

diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp
index b274206..a8843b9 100644 (file)
--- a/low-can-binding/can/message/can-message.cpp
+++ b/low-can-binding/can/message/can-message.cpp
@@ -114,12 +114,10 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca
        }
        else if (frame.can_id & CAN_EFF_FLAG)
        {
-               flags = flags|EXTENDED_ID;
                id = frame.can_id & CAN_EFF_MASK;
        }
        else
        {
-               flags = flags|STANDARD_ID;
                id = frame.can_id & CAN_SFF_MASK;
        }
 
@@ -133,9 +131,7 @@ std::shared_ptr<can_message_t> can_message_t::convert_from_frame(const struct ca
                        if(rtr_flag)
                                length = frame.len& 0xF;
                        else
-                       {
                                length = (frame.len > maxdlen) ? maxdlen : frame.len;
-                       }
                }
        }
        else
@@ -180,7 +176,9 @@ struct canfd_frame can_message_t::convert_to_canfd_frame()
                ::memcpy(frame.data, get_data(), length_);
        }
        else
+       {
                AFB_ERROR("can_message_t not correctly initialized to be sent");
+       }
 
        return frame;
 }
@@ -206,12 +204,12 @@ struct std::vector<canfd_frame> can_message_t::convert_to_canfd_frame_vector()
                                std::vector<uint8_t> data = get_data_vector((i*64),(i*64)+63);
                                if(data.size()<64)
                                {
-                                       ::memset(frame.data,0,sizeof(frame.data));
-                                       ::memcpy(frame.data,data.data(),data.size());
+                                       ::memset(frame.data, 0, sizeof(frame.data));
+                                       ::memcpy(frame.data, data.data(), data.size());
                                }
                                else
                                {
-                                       ::memcpy(frame.data,data.data(),64);
+                                       ::memcpy(frame.data, data.data(), 64);
                                }
                                ret.push_back(frame);
                                i++;
@@ -228,13 +226,13 @@ struct std::vector<canfd_frame> can_message_t::convert_to_canfd_frame_vector()
                                std::vector<uint8_t> data = get_data_vector(i*8,(i*8)+7);
                                if(data.size()<8)
                                {
-                                       ::memset(frame.data,0,sizeof(frame.data));
-                                       ::memcpy(frame.data,data.data(),data.size());
+                                       ::memset(frame.data, 0, sizeof(frame.data));
+                                       ::memcpy(frame.data, data.data(), data.size());
                                }
                                else
                                {
-                                       ::memset(frame.data,0,sizeof(frame.data));
-                                       ::memcpy(frame.data,data.data(),8);
+                                       ::memset(frame.data, 0, sizeof(frame.data));
+                                       ::memcpy(frame.data, data.data(), 8);
                                }
                                ret.push_back(frame);
                                i++;
@@ -263,7 +261,9 @@ struct can_frame can_message_t::convert_to_can_frame()
                ::memcpy(frame.data, get_data(), length_);
        }
        else
+       {
                AFB_ERROR("can_message_t not correctly initialized to be sent");
+       }
 
        return frame;
 }
@@ -278,9 +278,7 @@ std::string can_message_t::get_debug_message()
        std::string ret = "";
        ret = ret + "Here is the next can message : id " + std::to_string(id_)  + " length " + std::to_string(length_) + ", data ";
        for (size_t i = 0; i < data_.size(); i++)
-       {
                ret = ret + std::to_string(data_[i]);
-       }
 
        return ret;
 }