Merge pull request #13 from nee-wom/bugfix_bool_argument

Support Bool arguments without type length
mikiepure · Oct 9, 2022 · 3c76e9f · 3c76e9f
2 parents 99edd38 + dc6aa97
commit 3c76e9f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/pydlt/payload.py b/src/pydlt/payload.py
@@ -261,11 +261,9 @@ def create_from_bytes(
         type_info = struct.unpack(f"{endian}I", data[: cls._TYPE_INFO_LENGTH])[0]
         type_info_base = type_info & MASK_BASE_TYPE
         if type_info_base == TypeInfo.TYPE_BOOL:
-            type_info_length = type_info & MASK_TYPE_LENGTH
-            if type_info_length == TypeInfo.TYPE_LENGTH_8BIT:
-                return ArgumentBool.from_data_payload(
-                    data[cls._TYPE_INFO_LENGTH :], msb_first
-                )
+            return ArgumentBool.from_data_payload(
+                data[cls._TYPE_INFO_LENGTH :], msb_first
+            )
         elif type_info_base == TypeInfo.TYPE_SIGNED:
             type_info_length = type_info & MASK_TYPE_LENGTH
             if type_info_length == TypeInfo.TYPE_LENGTH_8BIT:

diff --git a/tests/test_message.py b/tests/test_message.py
@@ -396,6 +396,14 @@ def test_message_verbose_payload_bool():
     assert cast(ArgumentBool, dlt_message2.verbose_payload.arguments[1]).data is True
 
 
+def test_bool_payload_without_type_length():
+    b1 = ArgumentBool(True)
+    dlt_bytes = bytearray(b1.to_bytes(False))
+    # clear the TypeInfo.TYPE_LENGTH_8BIT flag
+    dlt_bytes[0] = 0x10
+    assert Argument.create_from_bytes(dlt_bytes, False).data is True
+
+
 def test_message_verbose_payload_uint():
     path = TEST_RESULTS_DIR_PATH / Path(f"{sys._getframe().f_code.co_name}.dlt")