diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2020-01-07 19:33:11 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2020-01-09 16:26:18 +0100 |
| commit | 252d47fb4c0d3a69d3fffdf08213e771d61fcad1 (patch) | |
| tree | d7597f2d255e16837e3cd84c7bdd3c87e2e8d0ad /low-can-binding/can | |
| parent | 8c27aef5cb195d0f62ea715fc9b1be1c5868d496 (diff) | |
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 <arthur.guyader@iot.bzh>
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can')
| -rw-r--r-- | low-can-binding/can/can-decoder.cpp | 11 | ||||
| -rw-r--r-- | low-can-binding/can/message/message.hpp | 23 |
2 files changed, 1 insertions, 33 deletions
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_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(); 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 <memory> #include <linux/can.h> #include <linux/can/bcm.h> -#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 <low-can/can-message.hpp> /// @class message_t /// |