Rename some of the classes removing can- prefix

[apps/agl-service-can-low-level.git] / low-can-binding / can / can-decoder.hpp

diff --git a/low-can-binding/can/can-decoder.hpp b/low-can-binding/can/can-decoder.hpp
index ebe1de2..ac9eb5d 100644 (file)
--- 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<can_signal_t>& signals,
-                       float value, bool* send);
-       static openxc_DynamicField booleanDecoder(can_signal_t& signal, const std::vector<can_signal_t>& signals,
-                       float value, bool* send);
-       static openxc_DynamicField ignoreDecoder(can_signal_t& signal, const std::vector<can_signal_t>& signals,
-                       float value, bool* send);
-       static openxc_DynamicField noopDecoder(can_signal_t& signal, const std::vector<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, can_message_t& message,
-               const std::vector<can_signal_t>& signals);
+       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<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<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
+};