*/
#include "can-decoder.hpp"
+#include <climits>
#include "canutil/read.h"
#include "../utils/openxc-utils.hpp"
if(signal.get_sign() == sign_t::UNSIGNED)
return 1;
else if(signal.get_sign() == sign_t::SIGN_BIT_EXTERN) {
- end_bit = signal.get_bit_sign_position()%8;
+ end_bit = signal.get_bit_sign_position() % CHAR_BIT;
mask = static_cast<uint8_t>((1 << (end_bit + 1)) - 1);
- data_byte = can_data[signal.get_bit_sign_position()/8] & mask;
+ data_byte = can_data[signal.get_bit_sign_position() / CHAR_BIT] & mask;
}
else {
end_bit = new_end_bit;
///
float decoder_t::parse_signal_bitfield(signal_t& signal, std::shared_ptr<message_t> message)
{
- const std::vector<uint8_t> data = message->get_data_vector();
+ int sign;
+ std::vector<uint8_t> data;
std::vector<uint8_t> data_signal;
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;
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() & FRAME_LAYOUT_IS_BIGENDIAN)
+ 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);
for(int i=new_start_byte;i<=new_end_byte;i++)
data_signal.push_back(data[i]);
- int sign = decoder_t::handle_sign(signal, data_signal, new_end_bit, data);
+ sign = handle_sign(signal, data_signal, new_end_bit, data);
if(data_signal.size() > 65535)
AFB_ERROR("Too long data signal %s", signal.get_name().c_str());
uint32_t bit_size = signal.get_bit_size();
std::vector<uint8_t> new_data = std::vector<uint8_t>();
- new_data.reserve((bit_size / 8) + 1);
+ new_data.reserve((bit_size / CHAR_BIT) + 1);
int new_start_byte = 0;
int new_end_byte = 0;