msg_def: returns pgn if j1939 used 82/23382/3
authorArthur GUYADER <arthur.guyader@iot.bzh>
Thu, 12 Dec 2019 12:56:13 +0000 (13:56 +0100)
committerRomain Forlot <romain.forlot@iot.bzh>
Thu, 9 Jan 2020 15:25:36 +0000 (16:25 +0100)
This commit patch function get_id. It was only capable to return
id and id extended. Now it returns also pgn.

Change-Id: If5feb7e2ee3bc5ca33b16620d1b998c95414dda8
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
low-can-binding/can/message-definition.cpp

index 6989a90..8184e98 100644 (file)
@@ -68,7 +68,8 @@ const std::string message_definition_t::get_name() const{
 
 uint32_t message_definition_t::get_id() const
 {
-       return ((id_ & CAN_SFF_MASK) != id_) ? id_ | CAN_EFF_FLAG : id_;
+       return is_j1939() || ((id_ & CAN_SFF_MASK) == id_) ?
+               id_ : id_ | CAN_EFF_FLAG ;
 }
 
 bool message_definition_t::is_fd() const