X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-definition.cpp;h=e6fd862f0ab55eb566bbd4945673c656b57ca524;hb=80c39d6a1aeca232a0a0b5c597fecb3ad08f4702;hp=ab7a884b03a35e3e1df7a1eda9367370b0e65bf8;hpb=6d6b880b2769add860cb0f135e0f784f8aaf5e00;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 ab7a884b..e6fd862f 100644 --- a/low-can-binding/can/message-definition.cpp +++ b/low-can-binding/can/message-definition.cpp @@ -23,6 +23,7 @@ message_definition_t::message_definition_t( const std::string bus, uint32_t id, uint32_t flags, + bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, const vect_ptr_signal_t& signals) @@ -30,6 +31,7 @@ message_definition_t::message_definition_t( bus_{bus}, id_{id}, flags_{flags}, + frame_layout_is_little_{frame_layout_is_little}, frequency_clock_{frequency_clock}, force_send_changed_{force_send_changed}, last_value_{CAN_MESSAGE_SIZE}, @@ -41,6 +43,7 @@ message_definition_t::message_definition_t(const std::string bus, const std::string name, uint32_t length, uint32_t flags, + bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, const vect_ptr_signal_t& signals) @@ -50,6 +53,7 @@ message_definition_t::message_definition_t(const std::string bus, name_{name}, length_{length}, flags_{flags}, + frame_layout_is_little_{frame_layout_is_little}, frequency_clock_{frequency_clock}, force_send_changed_{force_send_changed}, last_value_{CAN_MESSAGE_SIZE}, @@ -62,19 +66,23 @@ 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 ((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 @@ -105,4 +113,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_little() const{ + return frame_layout_is_little_; +}