X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage%2Fcan-message.cpp;h=a8843b9f36ab038f3c9cac761fa329815a407dfc;hb=refs%2Fchanges%2F60%2F23260%2F6;hp=5c3e0f0ef6d1f0f65c1671b3f9a41638069f1ed1;hpb=e1caf27db81e9897af7512a0b47e0783593833d5;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message/can-message.cpp b/low-can-binding/can/message/can-message.cpp index 5c3e0f0e..a8843b9f 100644 --- a/low-can-binding/can/message/can-message.cpp +++ b/low-can-binding/can/message/can-message.cpp @@ -131,9 +131,7 @@ std::shared_ptr 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 @@ -178,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; } @@ -261,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; } @@ -276,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; }