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=ac43d4647b83a1793269699800da02c02aa5fed0;hp=75faedf089085ab71c1ba82b67ce5a2eab3cb854;hpb=4e95381b037b783b5f4193134732cb96ff6f52cf;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 75faedf0..d528f6a5 100644
--- a/CAN-binder/low-can-binding/can/can-signals.hpp
+++ b/CAN-binder/low-can-binding/can/can-signals.hpp
@@ -19,15 +19,15 @@
 
 #include <map>
 #include <mutex>
-#include <queue>
 #include <vector>
 #include <string>
+#include <memory>
 
 #include "openxc.pb.h"
+#include "can-message-definition.hpp"
 #include "../utils/timer.hpp"
 #include "../utils/socketcan-bcm.hpp"
 #include "can-message.hpp"
-#include "can-message-definition.hpp"
 #include "../diagnostic/diagnostic-message.hpp"
 
 extern "C"
@@ -39,7 +39,6 @@ extern "C"
 #define MESSAGE_SET_ID 0
 
 class can_signal_t;
-
 ///
 /// @brief The type signature for a CAN signal decoder.
 ///
@@ -57,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<can_signal_t>& signals, float value, bool* send);
+		const std::vector<std::shared_ptr<can_signal_t> >& signals, float value, bool* send);
 
 ///
 /// @brief: The type signature for a CAN signal encoder.
@@ -76,9 +75,7 @@ typedef uint64_t (*SignalEncoder)(can_signal_t* signal,
 class can_signal_t
 {
 private:
-	utils::socketcan_bcm_t	socket_; /*!< socket_ - Specific BCM socket that filter the signal read from CAN device */
-	std::uint8_t message_set_id_; ///< message_set_id_ - Index number to the message_set_id container object
-	std::uint8_t message_id_; ///< message_id_ - Index number to the message_definition_t container object
+	can_message_definition_t* parent_; /*!< parent_ - pointer to the parent message definition holding this signal*/
 	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.*/
@@ -113,8 +110,6 @@ private:
 
 public:
 	can_signal_t(
-		std::uint8_t message_set_id,
-		std::uint8_t message_id,
 		std::string generic_name,
 		uint8_t bit_position,
 		uint8_t bit_size,
@@ -131,11 +126,10 @@ 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;
+	can_message_definition_t* get_message() const;
+	const std::string get_generic_name() const;
 	const std::string get_name() const;
-	const std::string& get_prefix() const;
+	const std::string get_prefix() const;
 	uint8_t get_bit_position() const;
 	uint8_t get_bit_size() const;
 	float get_factor() const;
@@ -153,11 +147,11 @@ public:
 	SignalEncoder& get_encoder();
 	bool get_received() const;
 	float get_last_value() const;
+	std::pair<float, uint64_t> 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);
-
-	int create_rx_filter();
-	void read_socket();
-};
\ No newline at end of file
+	void set_timestamp(uint64_t timestamp);
+};