Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
de2ac23
tesla_preap: auto-read donor radar VIN
daggerhashjack Aug 21, 2026
e59da74
restore x86_64 acados pointers comma LFS can fetch
daggerhashjack Aug 22, 2026
2c03ea0
nap: radar settings page and Read VIN
daggerhashjack Aug 22, 2026
7b667dd
nap: drop behind-nosecone toggle
daggerhashjack Aug 22, 2026
d13ef7b
tesla_preap: keep chassis xWD when impersonating donor VIN
daggerhashjack Aug 23, 2026
f62b5fe
tesla_preap: add ignore-radar-HWFail toggle
daggerhashjack Aug 23, 2026
6a7cdd0
tesla_preap: honor ignore-HWFail on freeze+SGUFail
daggerhashjack Aug 23, 2026
0694780
tesla_preap: do not let IgnoreHwFail bypass freeze+SGUFail
daggerhashjack Aug 23, 2026
4505449
tesla_preap: IgnoreHwFail drops frozen+SGU tracks instead of faulting
daggerhashjack Aug 23, 2026
47ed616
tesla_preap: restore Tinkla 4WD nibble for VIN char 2/4 so this spare…
daggerhashjack Aug 24, 2026
a78a3e9
ui: live radar modal instead of panda-killing scripts
daggerhashjack Aug 25, 2026
347a2be
ui: show WAIT VIN until panda starts GTW
daggerhashjack Aug 25, 2026
915f48d
ui: fit live radar HUD and modal on C4 without clipping
daggerhashjack Aug 25, 2026
0e27c20
ui: live radar chips, VIN trio, and C4-safe HUD
daggerhashjack Aug 25, 2026
904645f
ui: hidpi key-on chips; C4 is state plus Close only
daggerhashjack Aug 25, 2026
7e4f99c
ui: restore C4 Close+Align and VIN trio on live radar
daggerhashjack Aug 25, 2026
3a37525
ui: hidpi range rings and All tracks; keep C4 strip
daggerhashjack Aug 25, 2026
b848fb3
ui: hidpi range rings and All tracks; C4 plot without full desk
daggerhashjack Aug 25, 2026
1362eb1
ui: C4 full-width plot; hidpi overlay 1100x400
daggerhashjack Aug 25, 2026
85de51b
ui: put C4 All tracks table back on live radar
daggerhashjack Aug 25, 2026
3fc8429
ui: put C4 tracks table back; hidpi rings and table top-right
daggerhashjack Aug 25, 2026
a251da4
ui: keep hidpi overlay at 980x380
daggerhashjack Aug 25, 2026
570cb48
ui: hidpi overlay 640x340 with range rings and All tracks header-right
daggerhashjack Aug 25, 2026
a03a745
ui: restore hidpi overlay 980x380
daggerhashjack Aug 25, 2026
846da11
ui: C4 full-width plot; keep hidpi rings and All tracks
daggerhashjack Aug 25, 2026
fcb710d
ui: C4 tracks table stays; do not swap plot for table
daggerhashjack Aug 25, 2026
0b9e836
ui: C4 plot required; no GTW table on 536x240
daggerhashjack Aug 25, 2026
37da6bf
ui: restore C4 ID/dRel/yRel/vRel table
daggerhashjack Aug 25, 2026
8dce0f8
ui: C4 All tracks table is ID/dRel/yRel/vRel, not optional
daggerhashjack Aug 25, 2026
d4f9fa8
ui: keep C4 tracks table; restore hidpi overlay 980x380
daggerhashjack Aug 25, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions common/params_keys.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,15 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> keys = {
{"NAPPedalEnabled", {PERSISTENT, BOOL}},
{"NAPPedalProfile", {PERSISTENT, INT, "4"}},
{"NAPRadarBehindNosecone", {PERSISTENT, BOOL}},
{"NAPRadarDonorVin", {PERSISTENT, STRING}},
{"NAPRadarEnabled", {PERSISTENT, BOOL}},
{"NAPRadarEpasType", {PERSISTENT, INT, "0"}},
{"NAPRadarHud", {PERSISTENT, BOOL}},
{"NAPRadarIgnoreHwFail", {PERSISTENT, BOOL}},
{"NAPRadarOffset", {PERSISTENT, FLOAT, "0.0"}},
{"NAPRadarPosition", {PERSISTENT, INT, "0"}},
{"NAPRadarReadVin", {CLEAR_ON_MANAGER_START, BOOL}},
{"NAPRadarVinReadStatus", {CLEAR_ON_MANAGER_START, STRING}},
{"NAPScriptRunning", {CLEAR_ON_MANAGER_START, BOOL}},
{"TermsVersion", {PERSISTENT, STRING}},
{"TrainingVersion", {PERSISTENT, STRING}},
Expand Down
42 changes: 42 additions & 0 deletions selfdrive/car/card.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,27 @@ def __init__(self, CI=None, RI=None) -> None:
# card is driven by can recv, expected at 100Hz
self.rk = Ratekeeper(100, print_delay_threshold=None)

self._can_packets: list[CanData] = []
self.radar_donor_vin = None
tesla_preap = any(cfg.safetyModel == car.CarParams.SafetyModel.teslaPreap for cfg in self.CP.safetyConfigs)
if tesla_preap:
from opendbc.car.tesla.preap.nap_conf import nap_conf
from opendbc.car.tesla.preap.radar_donor_vin import RadarDonorVinCommissioner

def store_donor_vin(vin: str) -> None:
nap_conf.radar_donor_vin = vin
self.params.put("NAPRadarVinReadStatus", f"saved {vin}")
cloudlog.info("preap radar donor vin stored")

self._nap_conf = nap_conf
self.radar_donor_vin = RadarDonorVinCommissioner(store_donor_vin)

def state_update(self) -> tuple[car.CarState, structs.RadarDataT | None]:
"""carState update loop, driven by can"""

can_strs = messaging.drain_sock_raw(self.can_sock, wait_for_one=True)
can_list = can_capnp_to_list(can_strs)
self._can_packets = [CanData(addr, dat, src) for _ts, frames in can_list for addr, dat, src in frames]

# Update carState from CAN
CS = self.CI.update(can_list)
Expand Down Expand Up @@ -258,6 +274,32 @@ def controls_update(self, CS: car.CarState, CC: car.CarControl):
# send car controls over can
now_nanos = self.can_log_mono_time if REPLAY else int(time.monotonic() * 1e9)
self.last_actuators_output, can_sends = self.CI.apply(CC, now_nanos)
can_sends = list(can_sends)
if self.radar_donor_vin is not None:
controls_allowed = False
if self.sm.valid['pandaStates']:
controls_allowed = any(ps.controlsAllowed for ps in self.sm['pandaStates'])
force_read = self.params.get_bool("NAPRadarReadVin")
if force_read and not self._nap_conf.radar_enabled:
self.params.put("NAPRadarVinReadStatus", "enable radar first")
self.params.put_bool("NAPRadarReadVin", False)
else:
can_sends.extend(self.radar_donor_vin.update(
self._can_packets,
time.monotonic(),
radar_enabled=self._nap_conf.radar_enabled,
stored_vin=self._nap_conf.radar_donor_vin,
controls_allowed=controls_allowed,
enabled=bool(CC.enabled),
force_read=force_read,
))
if force_read and self.radar_donor_vin.read_finished:
if not self.radar_donor_vin.reader.vin and self.radar_donor_vin.reader.failure:
self.params.put(
"NAPRadarVinReadStatus",
self.radar_donor_vin.reader.failure.name.lower().replace("_", " "),
)
self.params.put_bool("NAPRadarReadVin", False)
self.pm.send('sendcan', can_list_to_can_capnp(can_sends, msgtype='sendcan', valid=CS.canValid))

self.CC_prev = CC
Expand Down
4 changes: 2 additions & 2 deletions selfdrive/test/process_replay/fixture_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -1250,8 +1250,8 @@ def accept_six_process_outputs(
raise FixtureError("case_params.NAPPedalEnabled must be a bool")
if bool(case_params["NAPPedalEnabled"]) != (mode == "pedal"):
raise FixtureError("case_params.NAPPedalEnabled does not match case mode")
if case_params.get("NAPRadarEnabled") is not True or case_params.get("NAPRadarBehindNosecone") is not True:
raise FixtureError("case_params must enable radar emulation and nosecone flags")
if case_params.get("NAPRadarEnabled") is not True:
raise FixtureError("case_params must enable radar emulation")

missing = [name for name in SIX_PROCESS_OUTPUTS if name not in process_outputs]
if missing:
Expand Down
Loading
Loading