message: Correctly detect extended CAN id.

[apps/agl-service-can-low-level.git] / low-can-binding / can / message-definition.cpp

diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp
index 8060982..e6fd862 100644 (file)
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -72,19 +72,17 @@ const std::string message_definition_t::get_name() const{
 
 uint32_t message_definition_t::get_id() const
 {
-       return id_ & CAN_EFF_MASK ?
-               id_ | CAN_EFF_FLAG :
-               id_;
+       return ((id_ & CAN_SFF_MASK) != id_) ? id_ | CAN_EFF_FLAG : id_;
 }
 
 bool message_definition_t::is_fd() const
 {
-       return (flags_&FD_FRAME);
+       return (flags_ & CAN_PROTOCOL_WITH_FD_FRAME);
 }
 
 bool message_definition_t::is_j1939() const
 {
-       return (flags_&J1939_PROTOCOL);
+       return (flags_ & J1939_PROTOCOL);
 }
 
 bool message_definition_t::is_isotp() const