From 12a9552c27ac427c161c27f916fb4fd1a8e4b44c Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 3 Jun 2022 04:07:25 -0700 Subject: [PATCH] I wonder if the radar sends a response pending... debug dont cache fix debug --- selfdrive/car/car_helpers.py | 2 +- selfdrive/car/isotp_parallel_query.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index fc441ac2e7..e64f89d98a 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -102,7 +102,7 @@ def fingerprint(logcan, sendcan): if cached_params.carName == "mock": cached_params = None - if cached_params is not None and len(cached_params.carFw) > 0 and cached_params.carVin is not VIN_UNKNOWN: + if False and cached_params is not None and len(cached_params.carFw) > 0 and cached_params.carVin is not VIN_UNKNOWN: cloudlog.warning("Using cached CarParams") vin = cached_params.carVin car_fw = list(cached_params.carFw) diff --git a/selfdrive/car/isotp_parallel_query.py b/selfdrive/car/isotp_parallel_query.py index 1209a8f1a1..ce2483d51e 100644 --- a/selfdrive/car/isotp_parallel_query.py +++ b/selfdrive/car/isotp_parallel_query.py @@ -124,6 +124,7 @@ class IsoTpParallelQuery: if response_valid: last_response_time = time.monotonic() + cloudlog.warning(f"iso-tp got query response: {tx_addr}, {time.monotonic()}") if counter + 1 < len(self.request): msg.send(self.request[counter + 1]) request_counter[tx_addr] += 1 @@ -131,8 +132,11 @@ class IsoTpParallelQuery: results[tx_addr] = dat[len(expected_response):] request_done[tx_addr] = True else: + error_code = dat[2] if len(dat) > 2 else -1 + if error_code == 0x78: + cloudlog.warning(f"iso-tp query response pending: {tx_addr}, {time.monotonic()}") request_done[tx_addr] = True - cloudlog.warning(f"iso-tp query bad response: 0x{dat.hex()}") + cloudlog.warning(f"iso-tp query bad response: {tx_addr} - 0x{dat.hex()}") cur_time = time.monotonic() if cur_time - last_response_time > timeout: