X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fsignals.hpp;h=2fcc27ed054841b1cce03d9bfa76907ca9e38a38;hb=4780c23547407f6bafb7e14fb70aaeeca0a1257d;hp=cefd8b81965f850819dc078ce30d50170374b966;hpb=f9b67aecdc07d31def64175e0f58e9c0a113f94c;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/signals.hpp b/low-can-binding/can/signals.hpp
index cefd8b81..2fcc27ed 100644
--- a/low-can-binding/can/signals.hpp
+++ b/low-can-binding/can/signals.hpp
@@ -38,15 +38,13 @@ class signal_t;
 /// string or boolean.
 ///
 /// @param[in] signal - The CAN signal that we are decoding.
-/// @param[in] signalCount - The length of the signals array.
-/// @param[in] value - The CAN signal parsed from the message as a raw floating point
-///	value.
+/// @param[in] message - The message with data to decode.
 /// @param[out] send - An output parameter. If decoding fails or CAN signal is
 ///	not sending, this should be flipped to false.
 ///
 /// @return a decoded value in an openxc_DynamicField struct.
 ///
-typedef openxc_DynamicField (*signal_decoder)(signal_t& signal, float value, bool* send);
+typedef openxc_DynamicField (*signal_decoder)(signal_t& signal, std::shared_ptr<message_t> message, bool* send);
 
 ///
 /// @brief: The type signature for a CAN signal encoder.
@@ -62,17 +60,18 @@ typedef openxc_DynamicField (*signal_decoder)(signal_t& signal, float value, boo
 typedef uint64_t (*signal_encoder)(signal_t& signal,
 		 const openxc_DynamicField& field, bool* send);
 
+
 class signal_t
 {
 private:
 	std::shared_ptr<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.*/
-	uint8_t bit_position_; /*!< bitPosition_ - The starting bit of the signal in its CAN message (assuming
+					 * which make easier to sort message when the come in.*/
+	uint32_t bit_position_; /*!< bitPosition_ - The starting bit of the signal in its CAN message (assuming
 				*	non-inverted bit numbering, i.e. the most significant bit of
 				*	each byte is 0) */
-	uint8_t bit_size_; /*!< bit_size_ - The width of the bit field in the CAN message. */
+	uint32_t bit_size_; /*!< bit_size_ - The width of the bit field in the CAN message. */
 	float factor_; /*!< factor_ - The final value will be multiplied by this factor. Use 1 if you
 			*	don't need a factor. */
 	float offset_; /*!< offset_ - The final value will be added to this offset. Use 0 if you
@@ -80,8 +79,8 @@ private:
 	float min_value_; /*!< min_value_ - The minimum value for the processed signal.*/
 	float max_value_; /*!< max_value_ - The maximum value for the processed signal. */
 	frequency_clock_t frequency_; /*!< frequency_ - A frequency_clock_t struct to control the maximum frequency to
-				       * process and send this signal. To process every value, set the
-				       * clock's frequency to 0. */
+					   * process and send this signal. To process every value, set the
+					   * clock's frequency to 0. */
 	bool send_same_; /*!< send_same_ - If true, will re-send even if the value hasn't changed.*/
 	bool force_send_changed_; /*!< force_send_changed_ - If true, regardless of the frequency, it will send the
 				   * value if it has changed. */
@@ -96,7 +95,7 @@ private:
 				  * is used. */
 	bool received_; /*!< received_ - True if this signal has ever been received.*/
 	float last_value_; /*!< lastValue_ - The last received value of the signal. If 'received' is false,
-			    * this value is undefined. */
+				* this value is undefined. */
 	std::pair<bool,int> multiplex_; /*!< multiplex_ - If bool is false and int is 0 is not a multiplex signal
 										If bool is true, that indicate that is a multiplexor
 										If int is different of 0, that indicate the link with a multiplexor */
@@ -108,8 +107,8 @@ public:
 
 	signal_t(
 		std::string generic_name,
-		uint8_t bit_position,
-		uint8_t bit_size,
+		uint32_t bit_position,
+		uint32_t bit_size,
 		float factor,
 		float offset,
 		float min_value,
@@ -130,8 +129,8 @@ public:
 
 	signal_t(
 		std::string generic_name,
-		uint8_t bit_position,
-		uint8_t bit_size,
+		uint32_t bit_position,
+		uint32_t bit_size,
 		float factor,
 		float offset,
 		float min_value,
@@ -149,8 +148,8 @@ public:
 	std::shared_ptr<message_definition_t> get_message() const;
 	const std::string get_generic_name() const;
 	const std::string get_name() const;
-	uint8_t get_bit_position() const;
-	uint8_t get_bit_size() const;
+	uint32_t get_bit_position() const;
+	uint32_t get_bit_size() const;
 	float get_factor() const;
 	float get_offset() const;
 	frequency_clock_t& get_frequency();