diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2018-09-28 17:12:18 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-12-14 08:58:56 +0000 |
commit | ea35eabeadce57e4f5015797fea530c5bb219fff (patch) | |
tree | 69fbb0f4e4d5528500873d122bc35b3423d7ca96 /low-can-binding/can/can-message-definition.hpp | |
parent | b049485873e1692cc9e7857e91e017f86dd91218 (diff) |
CAN FD implementation
Add a flag to CAN message definitions which set the message as using FD
protocol if true.
Use a new generated file with the new FD flag field on the message
definitions.
Change BCM socket "struct" using an union to store the CAN frames either
using the FD struct or the classic non FD struct. A BCM socket can only
one frame type once configured.
Use as much as possible the "struct canfd_frame" in the binding and only
make a difference before writing or reading the socket. From a memory
point of view both struct are identical and only the last member differ
and could hold more data with messages of 64 bytes long. So the
canfd_frame is compatible with the can_frame and can be differentiated
by a flag set in the can_id member.
Remove now unused code processing can_frame.
Keep the diagnostic manager using the classic CAN frame.
Set the maximum number of frames that a BCM socket can handle to 257.
Bug-AGL: SPEC-1980
Change-Id: Ifcc041281ea6745fc25cbd384743761f4446f489
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/can-message-definition.hpp')
-rw-r--r-- | low-can-binding/can/can-message-definition.hpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/low-can-binding/can/can-message-definition.hpp b/low-can-binding/can/can-message-definition.hpp index 6d0f17d6..b9025cbb 100644 --- a/low-can-binding/can/can-message-definition.hpp +++ b/low-can-binding/can/can-message-definition.hpp @@ -43,6 +43,7 @@ private: can_message_set_t* parent_; ///< parent_ - Pointer to the CAN message set holding this CAN message definition */ std::string bus_; ///< bus_ - Address of CAN bus device. */ uint32_t id_; ///< id_ - The ID of the message.*/ + bool is_fd_; /*!< uses_fd_ - Flags to enable an FD CAN message communication*/ can_message_format_t format_; ///< 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 @@ -59,11 +60,18 @@ public: can_message_definition_t(const std::string bus); can_message_definition_t(const std::string bus, uint32_t id, frequency_clock_t frequency_clock, bool force_send_changed); can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed); - can_message_definition_t(const std::string bus, uint32_t id, can_message_format_t format, frequency_clock_t frequency_clock, bool force_send_changed, const std::vector<std::shared_ptr<can_signal_t> >& can_signals); + can_message_definition_t(const std::string bus, + uint32_t id, + bool is_fd, + can_message_format_t format, + frequency_clock_t frequency_clock, + bool force_send_changed, + const std::vector<std::shared_ptr<can_signal_t> >& can_signals); const std::string get_bus_name() const; const std::string get_bus_device_name() const; uint32_t get_id() const; + bool is_fd() const; std::vector<std::shared_ptr<can_signal_t> >& get_can_signals(); void set_parent(can_message_set_t* parent); |