From 64691cf96f9c4d7ff59dbd49e1fe01d26c1a00f6 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 5 Nov 2019 19:33:29 +0100 Subject: all: Format one line 'if' or 'for' statement. Bug-AGL: SPEC-2988 Change-Id: Ic3b9670a2ce9e982220c54f3632f690ee4eea686 Signed-off-by: Romain Forlot --- low-can-binding/can/can-decoder.cpp | 47 +++++++++---------------------------- 1 file changed, 11 insertions(+), 36 deletions(-) (limited to '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 c19614c0..56626691 100644 --- a/low-can-binding/can/can-decoder.cpp +++ b/low-can-binding/can/can-decoder.cpp @@ -36,55 +36,30 @@ float decoder_t::parse_signal_bitfield(signal_t& signal, std::shared_ptr data = message->get_data_vector(); std::vector data_signal; - uint32_t bit_size = signal.get_bit_size(); + uint8_t bit_size = (uint8_t) signal.get_bit_size(); uint32_t bit_position = signal.get_bit_position(); int new_start_byte = 0; int new_end_byte = 0; - int new_start_bit = 0; - int new_end_bit = 0; + uint8_t new_start_bit = 0; + uint8_t new_end_bit = 0; 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]); - } - - uint8_t new_bit_size = 0; - - if(bit_size > 255) - { - AFB_ERROR("Error signal %s to long bit size",signal.get_name().c_str()); - } - else - { - new_bit_size = (uint8_t) bit_size; - } - uint8_t bit_offset = 0; - if(new_start_bit > 255) - { - AFB_ERROR("Too long signal offset %d", new_start_bit); - } - else - { - bit_offset = (uint8_t) new_start_bit; - } +// if(bit_size > 255) +// AFB_ERROR("Error signal %s to long bit size",signal.get_name().c_str()); - uint16_t length = 0; +// if(new_start_bit > 255) +// AFB_ERROR("Too long signal offset %d", new_start_bit); if(data_signal.size() > 65535) - { AFB_ERROR("Too long data signal %s",signal.get_name().c_str()); - } - else - { - length = (uint16_t) data_signal.size(); - } - return bitfield_parse_float(data_signal.data(), length, - bit_offset, new_bit_size, signal.get_factor(), + return bitfield_parse_float(data_signal.data(), (uint16_t) data_signal.size(), + new_start_bit, bit_size, signal.get_factor(), signal.get_offset()); } @@ -114,8 +89,8 @@ openxc_DynamicField decoder_t::decode_bytes(signal_t& signal, std::shared_ptr