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
message: More explicit define about CAN protocols.
[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
ec65cba
..
3740ea2
100644
(file)
--- a/
low-can-binding/can/message/j1939-message.cpp
+++ b/
low-can-binding/can/message/j1939-message.cpp
@@
-94,11
+94,10
@@
uint8_t j1939_message_t::get_addr() const{
/// @param[in] timestamp - timestamp of the message
///
/// @return A j1939_message_t object fully initialized with sockaddr_can and data values.
/// @param[in] timestamp - timestamp of the message
///
/// @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)
+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;
{
int i;
uint32_t length = 0;
- uint32_t flags;
std::vector<uint8_t> data_vector;
if(nbytes > J1939_MAX_DLEN)
std::vector<uint8_t> data_vector;
if(nbytes > J1939_MAX_DLEN)
@@
-113,7
+112,7
@@
std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct socka
data_vector.clear();
std::string data_string;
data_vector.clear();
std::string data_string;
- data_string = converter_t::to_hex(data,length);
+ data_string = converter_t::to_hex(data,
length);
for(i=0;i<length;i++)
{
for(i=0;i<length;i++)
{
@@
-123,7
+122,7
@@
std::shared_ptr<j1939_message_t> j1939_message_t::convert_from_addr(struct socka
AFB_DEBUG("Found pgn: %X, length: %X, data %s",
addr.can_addr.j1939.pgn, length, data_string.c_str());
AFB_DEBUG("Found pgn: %X, length: %X, data %s",
addr.can_addr.j1939.pgn, length, data_string.c_str());
- return std::make_shared<j1939_message_t>(j1939_message_t(length, data_vector, timestamp,
addr.can_addr.j1939.name,addr.can_addr.j1939.pgn,
addr.can_addr.j1939.addr));
+ return std::make_shared<j1939_message_t>(j1939_message_t(length, 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.
}
/// @brief Test if members pgn_ and length are set.
@@
-159,6
+158,12
@@
uint32_t j1939_message_t::get_id() const
return get_pgn();
}
return get_pgn();
}
+void j1939_message_t::set_id(const canid_t id)
+{
+ pgn_ = id;
+}
+
+
/**
* @brief Return the sockname of the message
*
/**
* @brief Return the sockname of the message
*