X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fbinding%2Flow-can-subscription.hpp;h=df9788616afbb64a9f1a4074218b7c5bcfa9d5a3;hb=8c1df02d734676f79807e3a4682fb96ea88c5cb5;hp=fa6b795ee1e35eafbe49c3691c9961c86a55faa8;hpb=e1caf27db81e9897af7512a0b47e0783593833d5;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp
index fa6b795e..df978861 100644
--- a/low-can-binding/binding/low-can-subscription.hpp
+++ b/low-can-binding/binding/low-can-subscription.hpp
@@ -35,12 +35,13 @@ struct event_filter_t
 	float frequency; ///< frequency - Maximum frequency which will be received and pushed to a subscribed event.
 	float min; ///< min - Minimum value that the signal doesn't have to go below to be pushed.
 	float max; ///< max - Maximum value that the signal doesn't have to go above to be pushed.
+	bool promisc; //<promisc - Active mode promisc on socket that permit this feature (j1939)
 	canid_t rx_id; ///< rx_id - RX_ID for ISO_TP protocol
 	canid_t tx_id; ///< tx_id - TX_ID for ISO_TP protocol
 
-	event_filter_t() : frequency{0}, min{-__FLT_MAX__}, max{__FLT_MAX__}, rx_id{NO_CAN_ID}, tx_id{NO_CAN_ID} {};
+	event_filter_t() : frequency{0}, min{-__FLT_MAX__}, max{__FLT_MAX__}, promisc{false}, rx_id{NO_CAN_ID}, tx_id{NO_CAN_ID} {};
 	bool operator==(const event_filter_t& ext) const {
-		return frequency == ext.frequency && min == ext.min && max == ext.max && rx_id == ext.rx_id && tx_id == ext.tx_id;
+		return frequency == ext.frequency && min == ext.min && max == ext.max && promisc == ext.promisc && rx_id == ext.rx_id && tx_id == ext.tx_id;
 	}
 };
 
@@ -55,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.
@@ -87,17 +89,21 @@ public:
 	float get_frequency() const;
 	float get_min() const;
 	float get_max() const;
+	bool get_promisc() const;
 	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);
 	void set_max(float max);
 	void set_index(int index);
+	void set_promisc(bool promisc);
 	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);
@@ -106,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);