diff --git a/cereal b/cereal index ad4126e380..2cc5b67c42 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit ad4126e380b192d17a1b4dbddec257ceb45855e1 +Subproject commit 2cc5b67c42280dd714e8175ea7a35112279a66cd diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py index 8e0c76f857..ed585d4249 100755 --- a/selfdrive/car/fw_versions.py +++ b/selfdrive/car/fw_versions.py @@ -333,19 +333,20 @@ def get_fw_versions(logcan, sendcan, extra=None, timeout=0.1, debug=False, progr if addrs: query = IsoTpParallelQuery(sendcan, logcan, r.bus, addrs, r.request, r.response, r.rx_offset, debug=debug) t = 2 * timeout if i == 0 else timeout - fw_versions.update({addr: (version, r.rx_offset) for addr, version in query.get_data(t).items()}) + fw_versions.update({addr: (version, r.rx_offset, r.request) for addr, version in query.get_data(t).items()}) except Exception: cloudlog.warning(f"FW query exception: {traceback.format_exc()}") # Build capnp list to put into CarParams car_fw = [] - for addr, (version, rx_offset) in fw_versions.items(): + for addr, (version, rx_offset, request) in fw_versions.items(): f = car.CarParams.CarFw.new_message() f.ecu = ecu_types[addr] f.fwVersion = version f.address = addr[0] f.responseAddress = addr[0] + rx_offset + f.request = request if addr[1] is not None: f.subAddress = addr[1]