Merge panda subtree

2026-02-20 00:03:56 +08:00 · 2019-12-13 13:02:46 -08:00
parent 391eb0b74b bc7b9b38ae
commit df875819f5
105 changed files with 2436 additions and 1664 deletions
--- a/panda/examples/can_logger.py
+++ b/panda/examples/can_logger.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3

-import binascii
 import csv
 import sys
 from panda import Panda
@@ -21,7 +20,7 @@ def can_logger():
      sys.exit(0)

  try:
-    outputfile = open('output.csv', 'wb')
+    outputfile = open('output.csv', 'w')
    csvwriter = csv.writer(outputfile)
    #Write Header
    csvwriter.writerow(['Bus', 'MessageID', 'Message', 'MessageLength'])
@@ -35,7 +34,7 @@ def can_logger():
      can_recv = p.can_recv()

      for address, _, dat, src  in can_recv:
-        csvwriter.writerow([str(src), str(hex(address)), "0x" + binascii.hexlify(dat), len(dat)])
+        csvwriter.writerow([str(src), str(hex(address)), f"0x{dat.hex()}", len(dat)])

        if src == 0:
          bus0_msg_cnt += 1
@@ -44,10 +43,10 @@ def can_logger():
        elif src == 2:
          bus2_msg_cnt += 1

-        print("Message Counts... Bus 0: " + str(bus0_msg_cnt) + " Bus 1: " + str(bus1_msg_cnt) + " Bus 2: " + str(bus2_msg_cnt), end='\r')
+        print(f"Message Counts... Bus 0: {bus0_msg_cnt} Bus 1: {bus1_msg_cnt} Bus 2: {bus2_msg_cnt}", end='\r')

  except KeyboardInterrupt:
-    print("\nNow exiting. Final message Counts... Bus 0: " + str(bus0_msg_cnt) + " Bus 1: " + str(bus1_msg_cnt) + " Bus 2: " + str(bus2_msg_cnt))
+    print(f"\nNow exiting. Final message Counts... Bus 0: {bus0_msg_cnt} Bus 1: {bus1_msg_cnt} Bus 2: {bus2_msg_cnt}")
    outputfile.close()

 if __name__ == "__main__":
--- a/panda/examples/eps_read_software_ids.py
+++ b/panda/examples/eps_read_software_ids.py
@@ -1,59 +0,0 @@
-#!/usr/bin/env python3
-from panda import Panda
-from panda.python.uds import UdsClient, NegativeResponseError, DATA_IDENTIFIER_TYPE
-
-if __name__ == "__main__":
-  address = 0x18da30f1 # Honda EPS
-  panda = Panda()
-  uds_client = UdsClient(panda, address, debug=False)
-
-  print("tester present ...")
-  uds_client.tester_present()
-
-  try:
-    print("")
-    print("read data by id: boot software id ...")
-    data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.BOOT_SOFTWARE_IDENTIFICATION)
-    print(data.decode('utf-8'))
-  except NegativeResponseError as e:
-    print(e)
-
-  try:
-    print("")
-    print("read data by id: application software id ...")
-    data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_SOFTWARE_IDENTIFICATION)
-    print(data.decode('utf-8'))
-  except NegativeResponseError as e:
-    print(e)
-
-  try:
-    print("")
-    print("read data by id: application data id ...")
-    data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_DATA_IDENTIFICATION)
-    print(data.decode('utf-8'))
-  except NegativeResponseError as e:
-    print(e)
-
-  try:
-    print("")
-    print("read data by id: boot software fingerprint ...")
-    data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.BOOT_SOFTWARE_FINGERPRINT)
-    print(data.decode('utf-8'))
-  except NegativeResponseError as e:
-    print(e)
-
-  try:
-    print("")
-    print("read data by id: application software fingerprint ...")
-    data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_SOFTWARE_FINGERPRINT)
-    print(data.decode('utf-8'))
-  except NegativeResponseError as e:
-    print(e)
-
-  try:
-    print("")
-    print("read data by id: application data fingerprint ...")
-    data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_DATA_FINGERPRINT)
-    print(data.decode('utf-8'))
-  except NegativeResponseError as e:
-    print(e)
--- a/panda/examples/query_fw_versions.py
+++ b/panda/examples/query_fw_versions.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python3
+from tqdm import tqdm
+from panda import Panda
+from panda.python.uds import UdsClient, MessageTimeoutError, NegativeResponseError, SESSION_TYPE, DATA_IDENTIFIER_TYPE
+
+if __name__ == "__main__":
+  addrs = [0x700 + i for i in range(256)]
+  addrs += [0x18da0000 + (i<<8) + 0xf1 for i in range(256)]
+  results = {}
+
+  panda = Panda()
+  panda.set_safety_mode(Panda.SAFETY_ELM327)
+  print("querying addresses ...")
+  with tqdm(addrs) as t:
+    for addr in t:
+      # skip functional broadcast addrs
+      if addr == 0x7df or addr == 0x18db33f1:
+        continue
+      t.set_description(hex(addr))
+
+      uds_client = UdsClient(panda, addr, bus=1 if panda.has_obd() else 0, timeout=0.1, debug=False)
+      try:
+        uds_client.tester_present()
+        uds_client.diagnostic_session_control(SESSION_TYPE.EXTENDED_DIAGNOSTIC)
+      except NegativeResponseError:
+        pass
+      except MessageTimeoutError:
+        continue
+
+      resp = {}
+
+      try:
+        data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.BOOT_SOFTWARE_IDENTIFICATION)
+        if data: resp[DATA_IDENTIFIER_TYPE.BOOT_SOFTWARE_IDENTIFICATION] = data
+      except NegativeResponseError:
+        pass
+
+      try:
+        data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_SOFTWARE_IDENTIFICATION)
+        if data: resp[DATA_IDENTIFIER_TYPE.APPLICATION_SOFTWARE_IDENTIFICATION] = data
+      except NegativeResponseError:
+        pass
+
+      try:
+        data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_DATA_IDENTIFICATION)
+        if data: resp[DATA_IDENTIFIER_TYPE.APPLICATION_DATA_IDENTIFICATION] = data
+      except NegativeResponseError:
+        pass
+
+      try:
+        data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.BOOT_SOFTWARE_FINGERPRINT)
+        if data: resp[DATA_IDENTIFIER_TYPE.BOOT_SOFTWARE_FINGERPRINT] = data
+      except NegativeResponseError:
+        pass
+
+      try:
+        data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_SOFTWARE_FINGERPRINT)
+        if data: resp[DATA_IDENTIFIER_TYPE.APPLICATION_SOFTWARE_FINGERPRINT] = data
+      except NegativeResponseError:
+        pass
+
+      try:
+        data = uds_client.read_data_by_identifier(DATA_IDENTIFIER_TYPE.APPLICATION_DATA_FINGERPRINT)
+        if data: resp[DATA_IDENTIFIER_TYPE.APPLICATION_DATA_FINGERPRINT] = data
+      except NegativeResponseError:
+        pass
+
+      if resp.keys():
+        results[addr] = resp
+
+    print("results:")
+    if len(results.items()):
+      for addr, resp in results.items():
+        for rid, dat in resp.items():
+          print(hex(addr), hex(rid), dat.decode())
+    else:
+      print("no fw versions found!")
--- a/panda/examples/tesla_tester.py
+++ b/panda/examples/tesla_tester.py
@@ -22,7 +22,7 @@ def tesla_tester():
  body_bus_num = 1 # My TDC to OBD adapter has PT on bus0 BDY on bus1 and CH on bus2
  p.set_can_speed_kbps(body_bus_num, body_bus_speed)

-  # Now set the panda from its default of SAFETY_NOOUTPUT (read only) to SAFETY_ALLOUTPUT
+  # Now set the panda from its default of SAFETY_SILENT (read only) to SAFETY_ALLOUTPUT
  # Careful, as this will let us send any CAN messages we want (which could be very bad!)
  print("Setting Panda to output mode...")
  p.set_safety_mode(Panda.SAFETY_ALLOUTPUT)
@@ -37,7 +37,7 @@ def tesla_tester():

  #Back to safety...
  print("Disabling output on Panda...")
-  p.set_safety_mode(Panda.SAFETY_NOOUTPUT)
+  p.set_safety_mode(Panda.SAFETY_SILENT)

  print("Reading VIN from 0x568. This is painfully slow and can take up to 3 minutes (1 minute per message; 3 messages needed for full VIN)...")