From a160f1a6241ef71a0816fd604052f49efe2e0dd5 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Sat, 26 Aug 2023 07:00:46 -0700 Subject: [PATCH] IsoTpParallelQuery: extend timeout for every frame type (#29654) * recv returns updated * bump panda * bump * bump --- panda | 2 +- selfdrive/car/isotp_parallel_query.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda b/panda index cca252c8d497f5..0eb04fae67646e 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit cca252c8d497f52494b5c21aa30f915e9ffc6ce8 +Subproject commit 0eb04fae67646e283b7d750d1e2119e37c398f95 diff --git a/selfdrive/car/isotp_parallel_query.py b/selfdrive/car/isotp_parallel_query.py index adbc598ea60529..339857a2915d36 100644 --- a/selfdrive/car/isotp_parallel_query.py +++ b/selfdrive/car/isotp_parallel_query.py @@ -104,14 +104,14 @@ def get_data(self, timeout, total_timeout=60.): for tx_addr, msg in msgs.items(): try: - dat, rx_in_progress = msg.recv() + dat, updated = msg.recv() except Exception: cloudlog.exception(f"Error processing UDS response: {tx_addr}") request_done[tx_addr] = True continue - # Extend timeout for each consecutive ISO-TP frame to avoid timing out on long responses - if rx_in_progress: + # Extend timeout for each valid ISO-TP frame to avoid timing out on long responses + if updated: addrs_responded.add(tx_addr) response_timeouts[tx_addr] = time.monotonic() + timeout