From 45bb9ed963226529cd6c0e4babdc30ea1e7748dd Mon Sep 17 00:00:00 2001 From: Sauci Date: Wed, 31 Jul 2019 14:37:23 +0200 Subject: [PATCH] fix incorrect evaluation order for decoding STmin parameter. --- source/CanTp.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/source/CanTp.c b/source/CanTp.c index c60eb16..35b88b4 100755 --- a/source/CanTp.c +++ b/source/CanTp.c @@ -2377,21 +2377,21 @@ static uint8 CanTp_EncodeSTMinValue(const uint16 value) { uint8 result; - if (CanTp_ConvertUsToMs(value) <= 0x7Fu) + if ((value == 100u) || + (value == 200u) || + (value == 300u) || + (value == 400u) || + (value == 500u) || + (value == 600u) || + (value == 700u) || + (value == 800u) || + (value == 900u)) { - result = (uint8)CanTp_ConvertUsToMs(value); + result = (uint8)(0x00F0u | (value / 100u)); } - else if ((value == 100u) || - (value == 200u) || - (value == 300u) || - (value == 400u) || - (value == 500u) || - (value == 600u) || - (value == 700u) || - (value == 800u) || - (value == 900u)) + else if (CanTp_ConvertUsToMs(value) <= 0x7Fu) { - result = (uint8)(0x00F0u | (value / 100u)); + result = (uint8)CanTp_ConvertUsToMs(value); } else {