X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-signals.hpp;h=d528f6a5ca3af0c427b52cc60f03c569176687e0;hb=2e66a10937ca8189498b540e3e28047d829021ad;hp=cc4b6da3dd7c5fbf4ee6683060374ae75964bb27;hpb=e4a50a3e96aa39346ad7212cae984524276973dd;p=apps%2Fagl-service-can-low-level.git diff --git a/CAN-binder/low-can-binding/can/can-signals.hpp b/CAN-binder/low-can-binding/can/can-signals.hpp index cc4b6da3..d528f6a5 100644 --- a/CAN-binder/low-can-binding/can/can-signals.hpp +++ b/CAN-binder/low-can-binding/can/can-signals.hpp @@ -56,7 +56,7 @@ class can_signal_t; /// @return a decoded value in an openxc_DynamicField struct. /// typedef openxc_DynamicField (*SignalDecoder)(can_signal_t& signal, - const std::vector > signals, float value, bool* send); + const std::vector >& signals, float value, bool* send); /// /// @brief: The type signature for a CAN signal encoder. @@ -76,7 +76,6 @@ class can_signal_t { private: can_message_definition_t* parent_; /*!< parent_ - pointer to the parent message definition holding this signal*/ - utils::socketcan_bcm_t socket_; /*!< socket_ - Specific BCM socket that filter the signal read from CAN device */ std::string generic_name_; /*!< generic_name_ - The name of the signal to be output.*/ static std::string prefix_; /*!< prefix_ - generic_name_ will be prefixed with it. It has to reflect the used protocol. * which make easier to sort message when the come in.*/ @@ -127,7 +126,6 @@ public: SignalEncoder encoder, bool received); - utils::socketcan_bcm_t get_socket() const; can_message_definition_t* get_message() const; const std::string get_generic_name() const; const std::string get_name() const; @@ -149,12 +147,11 @@ public: SignalEncoder& get_encoder(); bool get_received() const; float get_last_value() const; + std::pair get_last_value_with_timestamp() const; void set_parent(can_message_definition_t* parent); void set_prefix(std::string val); void set_received(bool r); void set_last_value(float val); void set_timestamp(uint64_t timestamp); - - int create_rx_filter(); };