X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fmessage-definition.hpp;h=9d615ff0b19d369126a8ac73f748f279151f49cd;hb=b1cc43eb48778c4e5e30baa3d852307da056d82c;hp=f39bb71ef0a7483ed996d5f7575a40c9c4b79e91;hpb=88077fb4b383cf7f35093b6cc0d2d9d86c6f1bf3;p=apps%2Fagl-service-can-low-level.git diff --git a/low-can-binding/can/message-definition.hpp b/low-can-binding/can/message-definition.hpp index f39bb71e..9d615ff0 100644 --- a/low-can-binding/can/message-definition.hpp +++ b/low-can-binding/can/message-definition.hpp @@ -45,49 +45,53 @@ private: uint32_t id_; ///< id_ - The ID or the PGN (if j1939) of the message.*/ std::string name_; ///< name_ - J1939 PGN name uint32_t length_; ///< length_ - Message data length in bytes. For J1939 message, this is the expected data size - bool is_fd_; /*!< uses_fd_ - Flags to enable an FD CAN message communication*/ - message_format_t format_; ///< format_ - the format of the message's ID.*/ + uint32_t flags_; ///< format_ - the format of the message's ID.*/ frequency_clock_t frequency_clock_; ///< clock_ - an optional frequency clock to control the output of this /// message, if sent raw, or simply to mark the max frequency for custom /// handlers to retrieve.*/ + bool frame_layout_is_little_; /// last_value_; ///< last_value_ - The last received value of the message. Defaults to undefined. /// This is required for the forceSendChanged functionality, as the stack /// needs to compare an incoming CAN message with the previous frame.*/ - std::vector > signals_; ///< signals_ - Vector holding signal_t object which share the same arbitration ID */ + vect_ptr_signal_t signals_; ///< signals_ - Vector holding signal_t object which share the same arbitration ID */ public: //message_definition_t(const message_definition_t& b); message_definition_t(const std::string bus); message_definition_t(const std::string bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed); - message_definition_t(const std::string bus, uint32_t id, message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed); + message_definition_t(const std::string bus, uint32_t id, uint32_t flags, frequency_clock_t frequency_clock, bool force_send_changed); message_definition_t(const std::string bus, uint32_t id, - bool is_fd, - message_format_t format, + uint32_t flags, + bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, - const std::vector >& signals); + const vect_ptr_signal_t& signals); message_definition_t(const std::string bus, uint32_t id, std::string name, uint32_t length, - bool is_fd, - message_format_t format, + uint32_t flags, + bool frame_layout_is_little, frequency_clock_t frequency_clock, bool force_send_changed, - const std::vector >& signals); + const vect_ptr_signal_t& signals); const std::string get_bus_name() const; const std::string get_bus_device_name() const; + const std::string get_name() const; uint32_t get_id() const; bool is_fd() const; bool is_j1939() const; - std::vector>& get_signals(); + bool is_isotp() const; + vect_ptr_signal_t& get_signals(); uint32_t get_length() const; - message_format_t get_format() const; + uint32_t get_flags() const; + bool frame_layout_is_little() const; void set_parent(std::shared_ptr parent); void set_last_value(std::shared_ptr m);