decoder: rework how to swap frame layout.

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

diff --git a/low-can-binding/can/can-decoder.cpp b/low-can-binding/can/can-decoder.cpp
index d70f125..0e64ccc 100644 (file)
--- a/low-can-binding/can/can-decoder.cpp
+++ b/low-can-binding/can/can-decoder.cpp
@@ -99,6 +99,14 @@ float decoder_t::parse_signal_bitfield(signal_t& signal, std::shared_ptr<message
        uint8_t bit_size = (uint8_t) signal.get_bit_size();
        uint32_t bit_position = signal.get_bit_position();
 
+       if(!signal.get_message()->frame_layout_is_little())
+       {
+               bit_position = converter_t::bit_position_swap(message->get_length(),
+                                                             signal.get_bit_position(),
+                                                             signal.get_bit_size());
+               message->frame_swap();
+       }
+
        int new_start_byte = 0;
        int new_end_byte = 0;
        uint8_t new_start_bit = 0;
@@ -156,7 +164,7 @@ openxc_DynamicField decoder_t::decode_bytes(signal_t& signal, std::shared_ptr<me
 
        if(new_start_byte >= length)
        {
-               AFB_ERROR("Error in description of signals");
+               AFB_ERROR("Error in signal's description");
                return decoded_value;
        }
 
@@ -320,11 +328,6 @@ openxc_DynamicField decoder_t::decode_state(signal_t& signal, std::shared_ptr<me
 ///
 openxc_DynamicField decoder_t::translate_signal(signal_t& signal, std::shared_ptr<message_t> message, bool* send)
 {
-       if(!signal.get_message()->frame_layout_is_little() && !signal.bit_position_is_swapped())
-       {
-               signal.set_bit_position(converter_t::bit_position_swap(signal.get_bit_position(),signal.get_bit_size()));
-               signal.bit_position_is_swapped_reverse();
-       }
        // Must call the decoders every time, regardless of if we are going to
        // decide to send the signal or not.
        openxc_DynamicField decoded_value = decoder_t::decode_signal(signal,