diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 10:34:04 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2019-06-26 17:55:06 +0200 |
| commit | d2d2620bbb8f0aad0181e67e9f6affc3d6cb4a51 (patch) | |
| tree | 13e7c1069252dbadb2b430414f3722132d1d7013 /low-can-binding/binding/low-can-subscription.hpp | |
| parent | 82b45e3de8c92816c8080178224c5bd4be60a091 (diff) | |
Change can_message_t class usage for new j1939
This commit transforms the class can_message_t as the base class
and creates two derived classes: j1939_message_t and can_message_t.
Bug-AGL: SPEC-2386
Change-Id: I6d3afd8e4f5abff2cd0ec4e9910bd52a2893de76
Signed-off-by: Arthur Guyader <arthur.guyader@iot.bzh>
Signed-off-by: Stephane Desneux <stephane.desneux@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 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp index ded600c5..c9cd2e3f 100644 --- a/low-can-binding/binding/low-can-subscription.hpp +++ b/low-can-binding/binding/low-can-subscription.hpp @@ -54,7 +54,7 @@ private: std::shared_ptr<can_signal_t> can_signal_; ///< can_signal_ - the CAN signal subscribed std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_message_; ///< diagnostic_message_ - diagnostic messages meant to receive OBD2 /// responses. Normal diagnostic request and response are not tested for now. - std::shared_ptr<utils::socketcan_bcm_t> socket_; ///< socket_ - socket_ that receives CAN messages. + std::shared_ptr<utils::socketcan_t> socket_; ///< socket_ - socket_ that receives CAN messages. int set_event(); @@ -89,14 +89,16 @@ public: void set_min(float min); void set_max(float max); - struct utils::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}) const; - void add_one_bcm_frame(struct canfd_frame& cfd, struct utils::bcm_msg& bcm_msg) const; + 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}) const; + void add_one_bcm_frame(struct canfd_frame& cfd, struct bcm_msg& bcm_msg) const; int open_socket(const std::string& bus_name = ""); int create_rx_filter(std::shared_ptr<can_signal_t> sig); int create_rx_filter(std::shared_ptr<diagnostic_message_t> sig); - int create_rx_filter(utils::bcm_msg& bcm_msg); + static int create_rx_filter_can(low_can_subscription_t &subscription, std::shared_ptr<can_signal_t> sig); + static int create_rx_filter_j1939(low_can_subscription_t &subscription, std::shared_ptr<can_signal_t> sig); + static int create_rx_filter_bcm(low_can_subscription_t &subscription, struct bcm_msg& bcm_msg); - int tx_send(struct canfd_frame& cfd, const std::string& bus_name); + static int tx_send(low_can_subscription_t &subscription, struct canfd_frame& cfd, const std::string& bus_name); }; |