X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=CAN-binder%2Flow-can-binding%2Fcan%2Fcan-decoder.cpp;h=3e21397b493d75444baf77307277f061a74094ec;hb=7747851ca010a3dfe9ffee808376dd5a7af68b91;hp=eae4ef25444396111cbef43da5ab4ff2046ae623;hpb=6222973c39ee02ad52a5d0b4b400024157ff2eeb;p=apps%2Flow-level-can-service.git

diff --git a/CAN-binder/low-can-binding/can/can-decoder.cpp b/CAN-binder/low-can-binding/can/can-decoder.cpp
index eae4ef2..3e21397 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<std::shared_ptr<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<std::shared_ptr<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<std::shared_ptr<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<std::shared_ptr<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);
@@ -154,7 +154,7 @@ openxc_DynamicField decoder_t::stateDecoder(can_signal_t& signal,
 /// string or boolean.
 ///
 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)
+	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);
@@ -167,11 +167,12 @@ openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, const can_m
 	signal.set_received(true);
 
 	// Don't send if they is no changes
-	if ((signal.get_last_value() == value && !signal.get_send_same()) || !send )
+	if ((signal.get_last_value() == value && !signal.get_send_same()) || !*send )
 	{
 		*send = false;
 	}
 	signal.set_last_value(value);
+	signal.set_timestamp(message.get_timestamp());
 	signal.get_message()->set_last_value(message);
 	return decoded_value;
 }
@@ -192,7 +193,7 @@ openxc_DynamicField decoder_t::translateSignal(can_signal_t& signal, const can_m
 /// 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<std::shared_ptr<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();
@@ -215,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<std::shared_ptr<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);