Merge pull request #280 from andlaus/decode_fixes

Smallish decode fixes
mercedes-benz · Mar 13, 2024 · 96d2c88 · 96d2c88
2 parents 076bbe3 + d69a7b2
commit 96d2c88
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/odxtools/isotp_state_machine.py b/odxtools/isotp_state_machine.py
@@ -55,7 +55,7 @@ def decode_rx_frame(self, rx_id: int, data: bytes) -> Iterable[Tuple[int, bytes]
             return  # unknown CAN ID
 
         # decode the isotp segment
-        frame_type, _ = bitstruct.unpack("u4", data)
+        frame_type, _ = bitstruct.unpack("u4u4", data)
         assert isinstance(frame_type, int)
 
         telegram_len = None

diff --git a/odxtools/parameters/reservedparameter.py b/odxtools/parameters/reservedparameter.py
@@ -54,8 +54,6 @@ def get_coded_value_as_bytes(self, encode_state: EncodeState) -> bytes:
 
     @override
     def _decode_positioned_from_pdu(self, decode_state: DecodeState) -> ParameterValue:
-        decode_state.cursor_byte_position += ((self.bit_position or 0) + self.bit_length + 7) // 8
-
         return decode_state.extract_atomic_value(
             bit_length=self.bit_length,
             base_data_type=DataType.A_UINT32,

diff --git a/odxtools/uds.py b/odxtools/uds.py
@@ -175,4 +175,4 @@ def is_response_pending(telegram_payload: bytes, request_sid: Optional[int] = No
 # previous versions of odxtools had a typo here. hit happens!
 @deprecated(details="use is_response_pending()")  # type: ignore[misc]
 def is_reponse_pending(telegram_payload: bytes, request_sid: Optional[int] = None) -> bool:
-    return is_reponse_pending(telegram_payload, request_sid)  # type: ignore[no-any-return]
+    return is_response_pending(telegram_payload, request_sid)