From ddddc7a8cbb9de28b24cc7d762c25b57ad43e620 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Mon, 28 Aug 2023 23:27:58 -0700 Subject: [PATCH] Revert "IsoTpParallelQuery: extend timeout for every frame type" (#29693) * Revert "IsoTpParallelQuery: extend timeout for every frame type (#29654)" This reverts commit a160f1a6241ef71a0816fd604052f49efe2e0dd5. * bump * bump to master * figure out a clean way to exclude segments * revert * bump --- panda | 2 +- selfdrive/car/isotp_parallel_query.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda b/panda index 0eb04fae67..ca9d8675b9 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 0eb04fae67646e283b7d750d1e2119e37c398f95 +Subproject commit ca9d8675b90e637051786057ad80fe7e534b2ae4 diff --git a/selfdrive/car/isotp_parallel_query.py b/selfdrive/car/isotp_parallel_query.py index 339857a291..adbc598ea6 100644 --- a/selfdrive/car/isotp_parallel_query.py +++ b/selfdrive/car/isotp_parallel_query.py @@ -104,14 +104,14 @@ class IsoTpParallelQuery: for tx_addr, msg in msgs.items(): try: - dat, updated = msg.recv() + dat, rx_in_progress = msg.recv() except Exception: cloudlog.exception(f"Error processing UDS response: {tx_addr}") request_done[tx_addr] = True continue - # Extend timeout for each valid ISO-TP frame to avoid timing out on long responses - if updated: + # Extend timeout for each consecutive ISO-TP frame to avoid timing out on long responses + if rx_in_progress: addrs_responded.add(tx_addr) response_timeouts[tx_addr] = time.monotonic() + timeout