diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2019-12-08 15:56:39 +0100 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2020-01-09 16:25:36 +0100 |
| commit | fe780799e8117ac30f9c05bcd43616638f35e66a (patch) | |
| tree | fdb8446af8e6b2d2198a3426c15368134870ebf8 /low-can-binding/can/can-decoder.cpp | |
| parent | 82fcc034ffcd4a4b6566ea96f87c76fbdb522d1e (diff) | |
converter: Improve bit_position computation
- Fix wrong bit_position swap computed:
Need to multiply then lenght in bytes by 8 to get it for bits.
- Add a continental bit_position function:
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
- Use define CHAR_BIT instead of hardcoded 8 value
Change-Id: I8d458ab457f80e5fa116af942acfceaaef51b763
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'low-can-binding/can/can-decoder.cpp')
| -rw-r--r-- | low-can-binding/can/can-decoder.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/low-can-binding/can/can-decoder.cpp b/low-can-binding/can/can-decoder.cpp index 0af488b2..ae10cd98 100644 --- a/low-can-binding/can/can-decoder.cpp +++ b/low-can-binding/can/can-decoder.cpp @@ -16,6 +16,7 @@ */ #include "can-decoder.hpp" +#include <climits> #include "canutil/read.h" #include "../utils/openxc-utils.hpp" @@ -41,9 +42,9 @@ int decoder_t::handle_sign(const signal_t& signal, std::vector<uint8_t>& data_si 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; @@ -152,7 +153,7 @@ openxc_DynamicField decoder_t::decode_bytes(signal_t& signal, std::shared_ptr<me 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; |