clean up

selfdrive/car/fw_query_definitions.py

@@ -59,9 +59,6 @@ class StdQueries:
   UDS_VIN_REQUEST = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + p16(uds.DATA_IDENTIFIER_TYPE.VIN)
   UDS_VIN_RESPONSE = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER + 0x40]) + p16(uds.DATA_IDENTIFIER_TYPE.VIN)
 
-  GM_VIN_REQUEST = b'\x1a\x90'
-  GM_VIN_RESPONSE = b'\x5a\x90'
-
 
 @dataclass
 class Request:

selfdrive/car/isotp_parallel_query.py

@@ -9,7 +9,6 @@ from panda.python.uds import CanClient, IsoTpMessage, FUNCTIONAL_ADDRS, get_rx_a
 
 
 class IsoTpParallelQuery:
-  # TODO: support different rx offsets per addr
   def __init__(self, sendcan, logcan, bus, addrs, request, response, response_offset=0x8, functional_addrs=None, debug=False, response_pending_timeout=10):
     self.sendcan = sendcan
     self.logcan = logcan

selfdrive/car/vin.py

@@ -18,10 +18,7 @@ def is_valid_vin(vin: str):
 def get_vin(logcan, sendcan, buses, timeout=0.1, retry=3, debug=False):
   for i in range(retry):
     for bus in buses:
-      # TODO: can you send to 0x7df on bolt?
+      for request, response in ((StdQueries.UDS_VIN_REQUEST, StdQueries.UDS_VIN_RESPONSE), (StdQueries.OBD_VIN_REQUEST, StdQueries.OBD_VIN_RESPONSE)):
-      for request, response, vin_addrs, rx_offset in ((StdQueries.GM_VIN_REQUEST, StdQueries.GM_VIN_RESPONSE, STANDARD_VIN_ADDRS + [0x24b], 0x400),
-                                                      (StdQueries.UDS_VIN_REQUEST, StdQueries.UDS_VIN_RESPONSE, STANDARD_VIN_ADDRS, 0x8),
-                                                      (StdQueries.OBD_VIN_REQUEST, StdQueries.OBD_VIN_RESPONSE, STANDARD_VIN_ADDRS, 0x8)):
         try:
           query = IsoTpParallelQuery(sendcan, logcan, bus, STANDARD_VIN_ADDRS, [request, ], [response, ], functional_addrs=FUNCTIONAL_ADDRS, debug=debug)
           results = query.get_data(timeout)