X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=low-can-binding%2Fcan%2Fcan-decoder.hpp;h=ac9eb5d9d9b9aa2c6db9480ec6be0c68be40fabc;hb=fa8c188743f5f2b4beaffc5673edc5e1f4c24996;hp=7eaa4a721a44d8f46d6eccf59c3c28c15e93a9aa;hpb=32e25cbca210a359b09768537b6f443fe90a3070;p=apps%2Fagl-service-can-low-level.git

diff --git a/low-can-binding/can/can-decoder.hpp b/low-can-binding/can/can-decoder.hpp
index 7eaa4a72..ac9eb5d9 100644
--- a/low-can-binding/can/can-decoder.hpp
+++ b/low-can-binding/can/can-decoder.hpp
@@ -17,33 +17,25 @@
 
 #pragma once
 
-#include "can-signals.hpp"
-#include "can-message.hpp"
+#include "signals.hpp"
+#include "message/can-message.hpp"
 #include "openxc.pb.h"
 
 class decoder_t
 {
 public:
-	static float parseSignalBitfield(can_signal_t& signal, const can_message_t& message);
+	static float parse_signal_bitfield(signal_t& signal, std::shared_ptr<message_t> message);
 
-	static openxc_DynamicField stateDecoder(can_signal_t& signal, const std::vector<std::shared_ptr<can_signal_t> >& signals,
-			float value, bool* send);
-	static openxc_DynamicField booleanDecoder(can_signal_t& signal, const std::vector<std::shared_ptr<can_signal_t> >& signals,
-			float value, bool* send);
-	static openxc_DynamicField ignoreDecoder(can_signal_t& signal, const std::vector<std::shared_ptr<can_signal_t> >& signals,
-			float value, bool* send);
-	static openxc_DynamicField noopDecoder(can_signal_t& signal, const std::vector<std::shared_ptr<can_signal_t> >& signals,
-			float value, bool* send);
+	static openxc_DynamicField decode_state(signal_t& signal, float value, bool* send);
+	static openxc_DynamicField decode_boolean(signal_t& signal, float value, bool* send);
+	static openxc_DynamicField decode_ignore(signal_t& signal, float value, bool* send);
+	static openxc_DynamicField decode_noop(signal_t& signal, float value, bool* send);
 
-	static openxc_DynamicField translateSignal(can_signal_t& signal, const can_message_t& message,
-		const std::vector<std::shared_ptr<can_signal_t> >& signals, bool* send);
+	static openxc_DynamicField translate_signal(signal_t& signal, std::shared_ptr<message_t> message, bool* send);
 
-	static openxc_DynamicField decodeSignal(can_signal_t& signal, const can_message_t& message,
-			const std::vector<std::shared_ptr<can_signal_t> >& signals, bool* send);
+	static openxc_DynamicField decode_signal(signal_t& signal, std::shared_ptr<message_t> message, bool* send);
 
-	static openxc_DynamicField decodeSignal(can_signal_t& signal, float value,
-		const std::vector<std::shared_ptr<can_signal_t> >& signals, bool* send);
+	static openxc_DynamicField decode_signal(signal_t& signal, float value, bool* send);
 
 	static float decode_obd2_response(const DiagnosticResponse* response, float parsed_payload);
-
-};
\ No newline at end of file
+};