Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
decoder: rework how to swap frame layout.
[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
0ef693c
..
a8843b9
100644
(file)
--- a/
low-can-binding/can/message/can-message.cpp
+++ b/
low-can-binding/can/message/can-message.cpp
@@
-55,6
+55,11
@@
uint32_t can_message_t::get_id() const
}
}
+void can_message_t::set_id(const canid_t id)
+{
+ id_ = id;
+}
+
/// @brief Control whether the object is correctly initialized
/// to be sent over the CAN bus
///
/// @brief Control whether the object is correctly initialized
/// to be sent over the CAN bus
///
@@
-109,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)
{
}
else if (frame.can_id & CAN_EFF_FLAG)
{
- flags = flags|EXTENDED_ID;
id = frame.can_id & CAN_EFF_MASK;
}
else
{
id = frame.can_id & CAN_EFF_MASK;
}
else
{
- flags = flags|STANDARD_ID;
id = frame.can_id & CAN_SFF_MASK;
}
id = frame.can_id & CAN_SFF_MASK;
}
@@
-128,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
if(rtr_flag)
length = frame.len& 0xF;
else
- {
length = (frame.len > maxdlen) ? maxdlen : frame.len;
length = (frame.len > maxdlen) ? maxdlen : frame.len;
- }
}
}
else
}
}
else
@@
-175,7
+176,9
@@
struct canfd_frame can_message_t::convert_to_canfd_frame()
::memcpy(frame.data, get_data(), length_);
}
else
::memcpy(frame.data, get_data(), length_);
}
else
+ {
AFB_ERROR("can_message_t not correctly initialized to be sent");
AFB_ERROR("can_message_t not correctly initialized to be sent");
+ }
return frame;
}
return frame;
}
@@
-201,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)
{
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
{
}
else
{
- ::memcpy(frame.data,
data.data(),
64);
+ ::memcpy(frame.data,
data.data(),
64);
}
ret.push_back(frame);
i++;
}
ret.push_back(frame);
i++;
@@
-223,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)
{
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
{
}
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++;
}
ret.push_back(frame);
i++;
@@
-258,7
+261,9
@@
struct can_frame can_message_t::convert_to_can_frame()
::memcpy(frame.data, get_data(), length_);
}
else
::memcpy(frame.data, get_data(), length_);
}
else
+ {
AFB_ERROR("can_message_t not correctly initialized to be sent");
AFB_ERROR("can_message_t not correctly initialized to be sent");
+ }
return frame;
}
return frame;
}
@@
-273,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++)
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]);
ret = ret + std::to_string(data_[i]);
- }
return ret;
}
return ret;
}