X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-decoder.cpp;h=aa1f57edbdef24cc38a16a8aeb6ab73ea1c6b0e2;hb=e4a50a3e96aa39346ad7212cae984524276973dd;hp=f36c4b94df358fd8457b166932b5232586ab1004;hpb=692376f019562e48ddef074b427f2397cae25087;p=apps%2Fagl-service-can-low-level.git

diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp
index f36c4b94..aa1f57ed 100644
--- a/CAN-binder/low-can-binding/can/can-decoder.cpp
+++ b/CAN-binder/low-can-binding/can/can-decoder.cpp
@@ -19,7 +19,7 @@
 
 #include "canutil/read.h"
 #include "../utils/openxc-utils.hpp"
-
+#include "can-message-definition.hpp"
 #include "../binding/low-can-hat.hpp"
 
 /// @brief Parse the signal's bitfield from the given data and return the raw
@@ -54,7 +54,7 @@ float decoder_t::parseSignalBitfield(can_signal_t& signal, const can_message_t&
 /// always succeeds.
 ///
 openxc_DynamicField decoder_t::noopDecoder(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)
 {
 	openxc_DynamicField decoded_value = build_DynamicField(value);
 
@@ -76,7 +76,7 @@ openxc_DynamicField decoder_t::noopDecoder(can_signal_t& signal,
 /// decoder always succeeds.
 ///
 openxc_DynamicField decoder_t::booleanDecoder(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)
 {
 	openxc_DynamicField decoded_value = build_DynamicField(value == 0.0 ? false : true);
 
@@ -98,7 +98,7 @@ openxc_DynamicField decoder_t::booleanDecoder(can_signal_t& signal,
 /// @return Return value is undefined.
 ///
 openxc_DynamicField decoder_t::ignoreDecoder(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)
 {
 	if(send)
 	  *send = false;
@@ -125,7 +125,7 @@ openxc_DynamicField decoder_t::ignoreDecoder(can_signal_t& signal,
 /// return value is undefined.
 ///
 openxc_DynamicField decoder_t::stateDecoder(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)
 {
 	const std::string signal_state = signal.get_states((uint8_t)value);
 	openxc_DynamicField decoded_value = build_DynamicField(signal_state);
@@ -153,8 +153,8 @@ openxc_DynamicField decoder_t::stateDecoder(can_signal_t& signal,
 /// The decoder returns an openxc_DynamicField, which may contain a number,
 /// string or boolean.
 ///
-openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, can_message_t& message,
-	const std::vector<can_signal_t>& signals, bool* send)
+openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, const can_message_t& message,
+	const std::vector<std::shared_ptr<can_signal_t> > signals, bool* send)
 {
 	float value = decoder_t::parseSignalBitfield(signal, message);
 	DEBUG(binder_interface, "%s: Decoded message from parseSignalBitfield: %f", __FUNCTION__, value);
@@ -172,6 +172,8 @@ openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, can_message
 		*send = false;
 	}
 	signal.set_last_value(value);
+	signal.set_timestamp(message.get_timestamp());
+	signal.get_message()->set_last_value(message);
 	return decoded_value;
 }
 
@@ -191,7 +193,7 @@ openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, can_message
 /// string or boolean. If 'send' is false, the return value is undefined.
 ///
 openxc_DynamicField decoder_t::decodeSignal( can_signal_t& signal,
-		float value, const std::vector<can_signal_t>& signals, bool* send)
+		float value, const std::vector<std::shared_ptr<can_signal_t> > signals, bool* send)
 {
 	SignalDecoder decoder = signal.get_decoder() == nullptr ?
 							noopDecoder : signal.get_decoder();
@@ -214,7 +216,7 @@ openxc_DynamicField decoder_t::decodeSignal( can_signal_t& signal,
 ///      not be decoded.
 ///
 openxc_DynamicField decoder_t::decodeSignal( can_signal_t& signal,
-		const can_message_t& message, const std::vector<can_signal_t>& signals, bool* send)
+		const can_message_t& message, const std::vector<std::shared_ptr<can_signal_t> > signals, bool* send)
 {
 	float value = parseSignalBitfield(signal, message);
 	return decodeSignal(signal, value, signals, send);