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
Static code review fixes.
[apps/agl-service-can-low-level.git]
/
CAN-binder
/
low-can-binding
/
can
/
can-message.cpp
diff --git
a/CAN-binder/low-can-binding/can/can-message.cpp
b/CAN-binder/low-can-binding/can/can-message.cpp
index
3fe2a5c
..
abfbfdb
100644
(file)
--- a/
CAN-binder/low-can-binding/can/can-message.cpp
+++ b/
CAN-binder/low-can-binding/can/can-message.cpp
@@
-27,7
+27,7
@@
/// Constructor about can_message_t class.
///
can_message_t::can_message_t()
/// Constructor about can_message_t class.
///
can_message_t::can_message_t()
- : maxdlen_{0}, id_{0}, length_{0}, format_{can_message_format_t::
ERROR}, rtr_flag_{false}, flags
_{0}
+ : maxdlen_{0}, id_{0}, length_{0}, format_{can_message_format_t::
INVALID}, rtr_flag_{false}, flags_{0}, timestamp
_{0}
{}
can_message_t::can_message_t(uint8_t maxdlen,
{}
can_message_t::can_message_t(uint8_t maxdlen,
@@
-36,14
+36,16
@@
can_message_t::can_message_t(uint8_t maxdlen,
can_message_format_t format,
bool rtr_flag,
uint8_t flags,
can_message_format_t format,
bool rtr_flag,
uint8_t flags,
- std::vector<uint8_t> data)
+ std::vector<uint8_t>& data,
+ uint64_t timestamp)
: maxdlen_{maxdlen},
id_{id},
length_{length},
format_{format},
rtr_flag_{rtr_flag},
flags_{flags},
: maxdlen_{maxdlen},
id_{id},
length_{length},
format_{format},
rtr_flag_{rtr_flag},
flags_{flags},
- data_{data}
+ data_{data},
+ timestamp_{timestamp}
{}
///
{}
///
@@
-74,7
+76,7
@@
bool can_message_t::get_rtr_flag_() const
can_message_format_t can_message_t::get_format() const
{
if (format_ != can_message_format_t::STANDARD || format_ != can_message_format_t::EXTENDED)
can_message_format_t can_message_t::get_format() const
{
if (format_ != can_message_format_t::STANDARD || format_ != can_message_format_t::EXTENDED)
- return can_message_format_t::
ERROR
;
+ return can_message_format_t::
INVALID
;
return format_;
}
return format_;
}
@@
-119,6
+121,16
@@
uint8_t can_message_t::get_length() const
return length_;
}
return length_;
}
+uint64_t can_message_t::get_timestamp() const
+{
+ return timestamp_;
+}
+
+void can_message_t::set_timestamp(uint64_t timestamp)
+{
+ timestamp_ = timestamp;
+}
+
///
/// @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
@@
-127,7
+139,7
@@
uint8_t can_message_t::get_length() const
///
bool can_message_t::is_correct_to_send()
{
///
bool can_message_t::is_correct_to_send()
{
- if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::
ERROR
)
+ if (id_ != 0 && length_ != 0 && format_ != can_message_format_t::
INVALID
)
{
int i;
for(i=0;i<CAN_MESSAGE_SIZE;i++)
{
int i;
for(i=0;i<CAN_MESSAGE_SIZE;i++)
@@
-147,7
+159,7
@@
bool can_message_t::is_correct_to_send()
///
void can_message_t::set_format(const can_message_format_t new_format)
{
///
void can_message_t::set_format(const can_message_format_t new_format)
{
- if(new_format == can_message_format_t::STANDARD || new_format == can_message_format_t::EXTENDED || new_format == can_message_format_t::
ERROR
)
+ if(new_format == can_message_format_t::STANDARD || new_format == can_message_format_t::EXTENDED || new_format == can_message_format_t::
INVALID
)
format_ = new_format;
else
ERROR(binder_interface, "%s: Can set format, wrong format chosen", __FUNCTION__);
format_ = new_format;
else
ERROR(binder_interface, "%s: Can set format, wrong format chosen", __FUNCTION__);
@@
-162,7
+174,7
@@
void can_message_t::set_format(const can_message_format_t new_format)
///
/// @return A can_message_t object fully initialized with canfd_frame values.
///
///
/// @return A can_message_t object fully initialized with canfd_frame values.
///
-can_message_t can_message_t::convert_from_frame(const struct canfd_frame& frame, size_t nbytes)
+can_message_t can_message_t::convert_from_frame(const struct canfd_frame& frame, size_t nbytes
, uint64_t timestamp
)
{
uint8_t maxdlen, length, flags = (uint8_t)NULL;
uint32_t id;
{
uint8_t maxdlen, length, flags = (uint8_t)NULL;
uint32_t id;
@@
-187,7
+199,7
@@
can_message_t can_message_t::convert_from_frame(const struct canfd_frame& frame,
if (frame.can_id & CAN_ERR_FLAG)
{
if (frame.can_id & CAN_ERR_FLAG)
{
- format = can_message_format_t::
ERROR
;
+ format = can_message_format_t::
INVALID
;
id = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG);
}
else if (frame.can_id & CAN_EFF_FLAG)
id = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG);
}
else if (frame.can_id & CAN_EFF_FLAG)
@@
-239,10
+251,10
@@
can_message_t can_message_t::convert_from_frame(const struct canfd_frame& frame,
id, (uint8_t)format, length, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
}
id, (uint8_t)format, length, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
}
- return can_message_t(maxdlen, id, length, format, rtr_flag, flags, data);
+ return can_message_t(maxdlen, id, length, format, rtr_flag, flags, data
, timestamp
);
}
}
-can_message_t can_message_t::convert_from_frame(const struct can_frame& frame, size_t nbytes)
+can_message_t can_message_t::convert_from_frame(const struct can_frame& frame, size_t nbytes
, uint64_t timestamp
)
{
uint8_t maxdlen, length, flags = (uint8_t)NULL;
uint32_t id;
{
uint8_t maxdlen, length, flags = (uint8_t)NULL;
uint32_t id;
@@
-262,7
+274,7
@@
can_message_t can_message_t::convert_from_frame(const struct can_frame& frame, s
if (frame.can_id & CAN_ERR_FLAG)
{
if (frame.can_id & CAN_ERR_FLAG)
{
- format = can_message_format_t::
ERROR
;
+ format = can_message_format_t::
INVALID
;
id = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG);
}
else if (frame.can_id & CAN_EFF_FLAG)
id = frame.can_id & (CAN_ERR_MASK|CAN_ERR_FLAG);
}
else if (frame.can_id & CAN_EFF_FLAG)
@@
-310,7
+322,7
@@
can_message_t can_message_t::convert_from_frame(const struct can_frame& frame, s
// id, (uint8_t)format, length, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
}
// id, (uint8_t)format, length, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
}
- return can_message_t(maxdlen, id, length, format, rtr_flag, flags, data);
+ return can_message_t(maxdlen, id, length, format, rtr_flag, flags, data
, timestamp
);
}
///
}
///