diff options
| author |   Arthur Guyader <arthur.guyader@iot.bzh> | 2019-12-16 10:13:01 +0100 |
|---|---|---|
| committer |   Romain Forlot <romain.forlot@iot.bzh> | 2020-01-09 16:25:36 +0100 |
| commit | 8c1df02d734676f79807e3a4682fb96ea88c5cb5 (patch) | |
| tree | d80196e420f831114a4bc8d2e35e7bc052cfcdf4 /low-can-binding/binding/low-can-subscription.hpp | |
| parent | 74e83bfde6652df2ada831ae003ec51ca8e673c7 (diff) | |
low_can_subscription: Add msg_def and create_rx for message
This commit adds message_definition variable to subscribe to
message and not signals. And the function that init rx_filter
for message.
Also patch the error message
Change-Id: I98b0b4dc8fec6ccef6e103fcb8aae136f708aa16
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/binding/low-can-subscription.hpp')
| -rw-r--r-- | low-can-binding/binding/low-can-subscription.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp index 972b6d61..df978861 100644 --- a/low-can-binding/binding/low-can-subscription.hpp +++ b/low-can-binding/binding/low-can-subscription.hpp @@ -56,6 +56,7 @@ private: afb_event_t event_; ///< event_ - application framework event used to push on client /// Signal part + std::shared_ptr<message_definition_t> message_; std::shared_ptr<signal_t> signal_; ///< signal_ - the CAN signal subscribed vect_ptr_diag_msg_t diagnostic_message_; ///< diagnostic_message_ - diagnostic messages meant to receive OBD2 /// responses. Normal diagnostic request and response are not tested for now. @@ -92,6 +93,7 @@ public: canid_t get_rx_id() const; canid_t get_tx_id() const; std::shared_ptr<utils::socketcan_t> get_socket(); + std::shared_ptr<message_definition_t> get_message_definition(); void set_frequency(float freq); void set_min(float min); @@ -101,6 +103,7 @@ public: void set_rx_id(canid_t rx_id); void set_tx_id(canid_t tx_id); void set_signal(std::shared_ptr<signal_t> signal); + void set_message_definition(std::shared_ptr<message_definition_t> message); static struct bcm_msg make_bcm_head(uint32_t opcode, uint32_t can_id = 0, uint32_t flags = 0, const struct timeval& timeout = {0, 0}, const struct timeval& frequency_thinning = {0, 0}); static void add_one_bcm_frame(struct canfd_frame& cfd, struct bcm_msg& bcm_msg); @@ -109,6 +112,7 @@ public: static int open_socket(low_can_subscription_t &subscription, const std::string& bus_name = "", uint32_t flags = INVALID_FLAG); int create_rx_filter(std::shared_ptr<signal_t> sig); + int create_rx_filter(std::shared_ptr<message_definition_t> msg); int create_rx_filter(std::shared_ptr<diagnostic_message_t> sig); static int create_rx_filter_can(low_can_subscription_t &subscription, std::shared_ptr<signal_t> sig); static int create_rx_filter_j1939(low_can_subscription_t &subscription, std::shared_ptr<signal_t> sig); |