misc: Some cleanup and fixes about signatures.

[apps/agl-service-can-low-level.git] / low-can-binding / binding / low-can-subscription.hpp

diff --git a/low-can-binding/binding/low-can-subscription.hpp b/low-can-binding/binding/low-can-subscription.hpp
index 3f2c3ac..fa6b795 100644 (file)
--- a/low-can-binding/binding/low-can-subscription.hpp
+++ b/low-can-binding/binding/low-can-subscription.hpp
@@ -35,8 +35,8 @@ 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.
-       canid_t rx_id;
-       canid_t tx_id;
+       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} {};
        bool operator==(const event_filter_t& ext) const {
@@ -44,6 +44,7 @@ struct event_filter_t
        }
 };
 
+
 /// @brief The object stores socket to CAN to be used to write on it.
 /// This is a simple access to a CAN bus device without any subscriptions attached
 class low_can_subscription_t
@@ -55,7 +56,7 @@ private:
 
        /// Signal part
        std::shared_ptr<signal_t> signal_; ///< signal_ - the CAN signal subscribed
-       std::vector<std::shared_ptr<diagnostic_message_t> > diagnostic_message_; ///< diagnostic_message_ - diagnostic messages meant to receive OBD2
+       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.
        std::shared_ptr<utils::socketcan_t> socket_; ///< socket_ - socket_ that receives CAN messages.
 
@@ -79,7 +80,7 @@ public:
        const std::shared_ptr<signal_t> get_signal() const;
        bool is_signal_subscription_corresponding(const std::shared_ptr<signal_t>, const struct event_filter_t& event_filter) const;
        const std::shared_ptr<diagnostic_message_t> get_diagnostic_message(uint32_t pid) const;
-       const std::vector<std::shared_ptr<diagnostic_message_t> > get_diagnostic_message() const;
+       const vect_ptr_diag_msg_t get_diagnostic_message() const;
        const std::shared_ptr<diagnostic_message_t> get_diagnostic_message(const std::string& name) const;
        const std::string get_name() const;
        const std::string get_name(uint32_t pid) const;
@@ -98,7 +99,7 @@ public:
        void set_tx_id(canid_t tx_id);
        void set_signal(std::shared_ptr<signal_t> signal);
 
-       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 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);
        static void remove_last_bcm_frame(struct bcm_msg& bcm_msg);