X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=low-can-binding%2Fcan%2Fmessage%2Fj1939-message.cpp;h=3740ea20a8989ba7e6c094fb8a44a504f079f56e;hb=e1caf27db81e9897af7512a0b47e0783593833d5;hp=ec65cba4938086e891073133a9f67dc63c232646;hpb=7f038fed824cac9b747c033b441263512421c6b2;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message/j1939-message.cpp b/low-can-binding/can/message/j1939-message.cpp index ec65cba4..3740ea20 100644 --- 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. -std::shared_ptr 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::convert_from_addr(struct sockaddr_can& addr, uint8_t (&data)[128], size_t nbytes, uint64_t timestamp) { int i; uint32_t length = 0; - uint32_t flags; std::vector data_vector; if(nbytes > J1939_MAX_DLEN) @@ -113,7 +112,7 @@ std::shared_ptr j1939_message_t::convert_from_addr(struct socka 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 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()); - return std::make_shared(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(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. @@ -159,6 +158,12 @@ uint32_t j1939_message_t::get_id() const return get_pgn(); } +void j1939_message_t::set_id(const canid_t id) +{ + pgn_ = id; +} + + /** * @brief Return the sockname of the message *