message: move bit position flag and action

[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 ab7a884..dab502a 100644 (file)
--- a/low-can-binding/can/message-definition.cpp
+++ b/low-can-binding/can/message-definition.cpp
@@ -62,24 +62,29 @@ const std::string message_definition_t::get_bus_device_name() const
                .get_can_device_name(bus_);
 }
 
+const std::string message_definition_t::get_name() const{
+       return name_;
+}
+
 uint32_t message_definition_t::get_id() const
 {
-       return id_;
+       return is_j1939() || ((id_ & CAN_SFF_MASK) == id_) ?
+               id_ : id_ | CAN_EFF_FLAG ;
 }
 
 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
 {
-       return (flags_&ISOTP_PROTOCOL);
+       return (flags_ & ISOTP_PROTOCOL);
 }
 
 vect_ptr_signal_t& message_definition_t::get_signals()
@@ -105,4 +110,8 @@ uint32_t message_definition_t::get_length() const
 uint32_t message_definition_t::get_flags() const
 {
        return flags_;
-}
\ No newline at end of file
+}
+
+bool message_definition_t::frame_layout_is_bigendian() const{
+       return (flags_ & BYTE_FRAME_IS_BIG_ENDIAN);
+}