fix incorrect evaluation order for decoding STmin parameter.

Sauci · Jul 31, 2019 · 45bb9ed · 45bb9ed
1 parent 165ffaf
commit 45bb9ed
Showing 1 changed file with 12 additions and 12 deletions.
diff --git 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
     {