diff options
| -rw-r--r-- | low-can-binding/binding/low-can-hat.cpp | 4 | ||||
| -rw-r--r-- | low-can-binding/can/can-decoder.cpp | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/low-can-binding/binding/low-can-hat.cpp b/low-can-binding/binding/low-can-hat.cpp index 7e0d94a4..72580744 100644 --- a/low-can-binding/binding/low-can-hat.cpp +++ b/low-can-binding/binding/low-can-hat.cpp @@ -74,7 +74,11 @@ int read_message(sd_event_source *event_source, int fd, uint32_t revents, void * if (message->get_id() && message->get_length() && ! (message->get_flags() & INVALID_FLAG) ) + { + if(can_subscription->get_signal() != nullptr && can_subscription->get_signal()->get_message()->get_flags() & BYTE_FRAME_IS_BIG_ENDIAN) + message->frame_swap(); push_n_notify(message); + } } } } diff --git a/low-can-binding/can/can-decoder.cpp b/low-can-binding/can/can-decoder.cpp index 160a22b1..7221d716 100644 --- a/low-can-binding/can/can-decoder.cpp +++ b/low-can-binding/can/can-decoder.cpp @@ -104,17 +104,6 @@ float decoder_t::parse_signal_bitfield(signal_t& signal, std::shared_ptr<message uint8_t new_start_bit = 0; uint8_t new_end_bit = 0; - if(signal.get_message()->get_flags() & CONTINENTAL_BIT_POSITION) - bit_position = converter_t::continental_bit_position_mess(message->get_length(), - signal.get_bit_position(), - bit_size); - if(signal.get_message()->get_flags() & BIT_POSITION_REVERSED) - bit_position = converter_t::bit_position_swap(message->get_length(), - signal.get_bit_position(), - bit_size); - if(signal.get_message()->get_flags() & BYTE_FRAME_IS_BIG_ENDIAN) - message->frame_swap(); - data = message->get_data_vector(); converter_t::signal_to_bits_bytes(bit_position, bit_size, new_start_byte, new_end_byte, new_start_bit, new_end_bit); @@ -409,6 +398,17 @@ openxc_DynamicField decoder_t::translate_signal(signal_t& signal, std::shared_pt /// openxc_DynamicField decoder_t::decode_signal( signal_t& signal, std::shared_ptr<message_t> message, bool* send) { + + + if(signal.get_message()->get_flags() & CONTINENTAL_BIT_POSITION) + signal.set_bit_position(converter_t::continental_bit_position_mess(message->get_length(), + signal.get_bit_position(), + signal.get_bit_size())); + if(signal.get_message()->get_flags() & BIT_POSITION_REVERSED) + signal.set_bit_position(converter_t::bit_position_swap(message->get_length(), + signal.get_bit_position(), + signal.get_bit_size())); + signal_decoder decoder = signal.get_decoder() == nullptr ? decode_noop : signal.get_decoder(); |