this still works, but no type checking anymore

pull/33208/head
Shane Smiskol 10 months ago
parent 1b7dca87f3
commit 3597057c03
  1. 28
      selfdrive/car/fw_versions.py

@ -7,7 +7,6 @@ from tqdm import tqdm
import capnp import capnp
import panda.python.uds as uds import panda.python.uds as uds
# from cereal import car
from openpilot.selfdrive.car import carlog from openpilot.selfdrive.car import carlog
from openpilot.selfdrive.car.can_definitions import CanRecvCallable, CanSendCallable from openpilot.selfdrive.car.can_definitions import CanRecvCallable, CanSendCallable
from openpilot.selfdrive.car.data_structures import CarParams from openpilot.selfdrive.car.data_structures import CarParams
@ -308,19 +307,20 @@ def get_fw_versions(can_recv: CanRecvCallable, can_send: CanSendCallable, set_ob
if query_addrs: if query_addrs:
query = IsoTpParallelQuery(can_send, can_recv, r.bus, query_addrs, r.request, r.response, r.rx_offset, debug=debug) query = IsoTpParallelQuery(can_send, can_recv, r.bus, query_addrs, r.request, r.response, r.rx_offset, debug=debug)
for (tx_addr, sub_addr), version in query.get_data(timeout).items(): for (tx_addr, sub_addr), version in query.get_data(timeout).items():
f = CarParams.CarFw( f = CarParams.CarFw.new_message()
ecu=ecu_types.get((brand, tx_addr, sub_addr), Ecu.unknown),
fwVersion=version, f.ecu = ecu_types.get((brand, tx_addr, sub_addr), Ecu.unknown)
address=tx_addr, f.fwVersion = version
responseAddress=uds.get_rx_addr_for_tx_addr(tx_addr, r.rx_offset), f.address = tx_addr
request=r.request, f.responseAddress = uds.get_rx_addr_for_tx_addr(tx_addr, r.rx_offset)
brand=brand, f.request = r.request
bus=r.bus, f.brand = brand
# TODO: this is what I don't like about no more builders f.bus = r.bus
logging=r.logging or (ecu_types.get((brand, tx_addr, sub_addr), Ecu.unknown), tx_addr, sub_addr) in config.extra_ecus, f.logging = r.logging or (f.ecu, tx_addr, sub_addr) in config.extra_ecus
obdMultiplexing=r.obd_multiplexing, f.obdMultiplexing = r.obd_multiplexing
subAddress=sub_addr if sub_addr is not None else 0,
) if sub_addr is not None:
f.subAddress = sub_addr
car_fw.append(f) car_fw.append(f)
except Exception: except Exception:

Loading…
Cancel
Save