Merge branch 'commaai:master' into ccnc-port

commaai · Jan 17, 2025 · 3b074c1 · 3b074c1
2 parents 19ab12f + 045fc44
commit 3b074c1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 952 deletions.
diff --git a/__init__.py b/__init__.py
@@ -3,7 +3,7 @@
 from .python.serial import PandaSerial  # noqa: F401
 from .python.canhandle import CanHandle # noqa: F401
 from .python.utils import logger # noqa: F401
-from .python import (Panda, PandaDFU, uds, isotp, # noqa: F401
+from .python import (Panda, PandaDFU, isotp, # noqa: F401
                      pack_can_buffer, unpack_can_buffer, calculate_checksum,
                      DLC_TO_LEN, LEN_TO_DLC, ALTERNATIVE_EXPERIENCE, CANPACKET_HEAD_SIZE)
 

diff --git a/examples/query_fw_versions.py b/examples/query_fw_versions.py
@@ -2,8 +2,8 @@
 import argparse
 from tqdm import tqdm
 from panda import Panda
-from panda.python.uds import UdsClient, MessageTimeoutError, NegativeResponseError, InvalidSubAddressError, \
-                             SESSION_TYPE, DATA_IDENTIFIER_TYPE
+from opendbc.car.uds import UdsClient, MessageTimeoutError, NegativeResponseError, InvalidSubAddressError, \
+                            SESSION_TYPE, DATA_IDENTIFIER_TYPE
 
 if __name__ == "__main__":
   parser = argparse.ArgumentParser()
@@ -97,7 +97,7 @@
         resp = {}
         for uds_data_id in sorted(uds_data_ids):
           try:
-            data = uds_client.read_data_by_identifier(uds_data_id)  # type: ignore
+            data = uds_client.read_data_by_identifier(uds_data_id)
             if data:
               resp[uds_data_id] = data
           except (NegativeResponseError, MessageTimeoutError, InvalidSubAddressError):