X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-definition.cpp;h=051c2d3cb6e1d1c95a150a9cd8dcee5aa7c46ec8;hb=HEAD;hp=114307e597b789062122512507db0fc4433b4876;hpb=8b3af0fccba13e4098590322975bbd475d3d4f9e;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message-definition.cpp b/low-can-binding/can/message-definition.cpp index 114307e5..051c2d3c 100644 --- a/low-can-binding/can/message-definition.cpp +++ b/low-can-binding/can/message-definition.cpp @@ -56,6 +56,10 @@ message_definition_t::message_definition_t(const std::string bus, signals_{signals} {} +const std::string message_definition_t::get_bus_name() const{ + return bus_; +} + const std::string message_definition_t::get_bus_device_name() const { return application_t::instance().get_can_bus_manager() @@ -68,24 +72,23 @@ 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 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() @@ -112,3 +115,7 @@ uint32_t message_definition_t::get_flags() const { return flags_; } + +bool message_definition_t::frame_layout_is_bigendian() const{ + return (flags_ & BYTE_FRAME_IS_BIG_ENDIAN); +}