From 53f4f57d861b3da1f103e6097a9e87b0661426f4 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 30 Sep 2022 00:01:47 -0700 Subject: [PATCH] stash --- panda | 2 +- selfdrive/car/isotp_parallel_query.py | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/panda b/panda index 51f023bc66..394de3892f 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit 51f023bc66c2caa9007be1dda2738d0df51cbf0e +Subproject commit 394de3892ffe182d0e102e845d493efdb72ba011 diff --git a/selfdrive/car/isotp_parallel_query.py b/selfdrive/car/isotp_parallel_query.py index 31dc31d7a4..8836afec27 100644 --- a/selfdrive/car/isotp_parallel_query.py +++ b/selfdrive/car/isotp_parallel_query.py @@ -26,7 +26,23 @@ class IsoTpParallelQuery: else: self.real_addrs.append((a, None)) - self.msg_addrs = {tx_addr: get_rx_addr_for_tx_addr(tx_addr[0], rx_offset=response_offset) for tx_addr in self.real_addrs} + if self.functional_addr: + # Add standard physical addresses to tx on after initial functional address query + real_addrs = [] + self.msg_addrs = {} + for a in FUNCTIONAL_ADDRS: + if a in addrs: + self.msg_addrs[a] = get_rx_addr_for_tx_addr(a, rx_offset=response_offset) + for fun_addr in FUNCTIONAL_ADDRS[a][1:]: + print(fun_addr) + self.msg_addrs[fun_addr] = get_rx_addr_for_tx_addr(fun_addr, rx_offset=response_offset) + # self.msg_addrs[a].extend([get_rx_addr_for_tx_addr(fa, rx_offset=response_offset) for fa in FUNCTIONAL_ADDRS[a][1:]]) + + else: + real_addrs = [a if isinstance(a, tuple) else (a, None) for a in self.addrs] + + self.msg_addrs = {tx_addr: get_rx_addr_for_tx_addr(tx_addr[0], rx_offset=response_offset) for tx_addr in self.real_addrs} + print(self.msg_addrs) self.msg_buffer = defaultdict(list) def rx(self):