X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-signals.hpp;h=a56fc8cd03bdb1d6069f472d2f75924472b9874c;hb=5206b26e1a6811d142ffbaf12daaea0731345490;hp=b8fbe4efe1515f219c1776a52b79699565c59fc1;hpb=7747851ca010a3dfe9ffee808376dd5a7af68b91;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 b8fbe4ef..a56fc8cd 100644 --- a/CAN-binder/low-can-binding/can/can-signals.hpp +++ b/CAN-binder/low-can-binding/can/can-signals.hpp @@ -30,12 +30,6 @@ #include "can-message.hpp" #include "../diagnostic/diagnostic-message.hpp" -extern "C" -{ - #include - #include -} - #define MESSAGE_SET_ID 0 class can_signal_t; @@ -76,7 +70,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 +120,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 +141,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(); };