From 252d47fb4c0d3a69d3fffdf08213e771d61fcad1 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 7 Jan 2020 19:33:11 +0100 Subject: message: move bit position flag and action Separate some define to be in a dedicated header file that will be installed on the system. Then the low-can-generator could use it instead of having to copy those defines in the generator code. Change-Id: I1716c8b20f0811ca4ac1e8f13609f05ad7d24d1f Signed-off-by: Arthur Guyader Signed-off-by: Romain Forlot --- low-can-binding/can/can-decoder.cpp | 11 ----------- low-can-binding/can/message/message.hpp | 23 +---------------------- low-can-binding/utils/converter.cpp | 32 +------------------------------- low-can-binding/utils/converter.hpp | 6 ------ 4 files changed, 2 insertions(+), 70 deletions(-) (limited to 'low-can-binding') diff --git a/low-can-binding/can/can-decoder.cpp b/low-can-binding/can/can-decoder.cpp index 7221d716..5fe22541 100644 --- a/low-can-binding/can/can-decoder.cpp +++ b/low-can-binding/can/can-decoder.cpp @@ -398,17 +398,6 @@ 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, 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(); diff --git a/low-can-binding/can/message/message.hpp b/low-can-binding/can/message/message.hpp index b77ce8bd..6416bcfb 100644 --- a/low-can-binding/can/message/message.hpp +++ b/low-can-binding/can/message/message.hpp @@ -24,28 +24,7 @@ #include #include #include -#include "../../utils/timer.hpp" - -#define CAN_MESSAGE_SIZE 8 - -#define MAX_BCM_CAN_FRAMES 257 -#define MAX_ISOTP_FRAMES 4096 - - -/** - * FLAGS - */ -#define CAN_PROTOCOL 0x0001 -#define CAN_PROTOCOL_WITH_FD_FRAME 0x0002 -#define J1939_ADDR_CLAIM_PROTOCOL 0x0004 -#define J1939_PROTOCOL 0x0008 -#define ISOTP_PROTOCOL 0x0010 -#define ISOTP_SEND 0x0020 -#define ISOTP_RECEIVE 0x0040 -#define BYTE_FRAME_IS_BIG_ENDIAN 0x0080 -#define BIT_POSITION_REVERSED 0x0100 -#define CONTINENTAL_BIT_POSITION 0x0200 -#define INVALID_FLAG 0x8000 +#include /// @class message_t /// diff --git a/low-can-binding/utils/converter.cpp b/low-can-binding/utils/converter.cpp index 56f3a449..4c0a3a89 100644 --- a/low-can-binding/utils/converter.cpp +++ b/low-can-binding/utils/converter.cpp @@ -71,34 +71,4 @@ void converter_t::signal_to_bits_bytes(unsigned int bit_position, unsigned int b new_start_bit = bit_position % CHAR_BIT; new_end_byte = (bit_position + bit_size - 1) >> 3; new_end_bit = (bit_position + bit_size - 1) % CHAR_BIT; -} - - -/** - * @brief This is to use when you have a big endian CAN frame layout. - * It converts the bit position so it matches with little endiant CAN frame layout. - * - * @param msg_length Message length in bytes. - * @param bit_position Original bit position. - * @param bit_size Size of the data. - * @return uint32_t New bit position. - */ -uint32_t converter_t::bit_position_swap(unsigned int msg_length, unsigned int bit_position, unsigned int bit_size) -{ - return (msg_length * CHAR_BIT) - bit_position - bit_size; -} - -/** - * @brief This allow to get the correct bit_position using the weird Continental. - * bit numbering method where the Frame is read using little endianness - * and bit count using a big endianness - * - * @param msg_length Message length in bytes. - * @param bit_position Original bit position. - * @param bit_size Size of the data. - * @return uint32_t New bit position. - */ -uint32_t converter_t::continental_bit_position_mess(unsigned int msg_length, unsigned int bit_position, unsigned int bit_size) -{ - return bit_position + CHAR_BIT - 2 * (bit_position % CHAR_BIT) - bit_size; -} +} \ No newline at end of file diff --git a/low-can-binding/utils/converter.hpp b/low-can-binding/utils/converter.hpp index e8a40f5b..1e6ecc18 100644 --- a/low-can-binding/utils/converter.hpp +++ b/low-can-binding/utils/converter.hpp @@ -30,10 +30,4 @@ class converter_t int &new_end_byte, uint8_t &new_start_bit, uint8_t &new_end_bit); - static uint32_t bit_position_swap(unsigned int msg_length, - unsigned int bit_position, - unsigned int bit_size); - static uint32_t continental_bit_position_mess(unsigned int msg_length, - unsigned int bit_position, - unsigned int bit_size); }; -- cgit 1.2.3-korg