diff --git a/selfdrive/ui/sunnypilot/onroad/radar_tracks.py b/selfdrive/ui/sunnypilot/onroad/radar_tracks.py index f222db8e28..00e501496f 100644 --- a/selfdrive/ui/sunnypilot/onroad/radar_tracks.py +++ b/selfdrive/ui/sunnypilot/onroad/radar_tracks.py @@ -23,14 +23,6 @@ def radar_track_color(v_rel: float, v_ego: float = 0.0) -> rl.Color: return rl.Color(*color, 255) -def format_radar_tracks_onroad_status(live_tracks) -> str: - range_text, count_text = format_radar_tracks_onroad_columns(live_tracks) - if not range_text: - return count_text - - return "\n".join(f"{radar_range} {track_count}" for radar_range, track_count in zip(range_text.splitlines(), count_text.splitlines(), strict=True)) - - def format_radar_tracks_onroad_columns(live_tracks) -> tuple[str, str]: sources = sorted(live_tracks.trackSources, key=lambda source: (source.startAddress, source.endAddress, source.bus)) if not sources: diff --git a/selfdrive/ui/sunnypilot/onroad/test_radar_tracks.py b/selfdrive/ui/sunnypilot/onroad/test_radar_tracks.py index 5efe5084ca..3c11a415ef 100644 --- a/selfdrive/ui/sunnypilot/onroad/test_radar_tracks.py +++ b/selfdrive/ui/sunnypilot/onroad/test_radar_tracks.py @@ -1,7 +1,7 @@ from cereal import car from openpilot.selfdrive.ui.sunnypilot.onroad import radar_tracks -from openpilot.selfdrive.ui.sunnypilot.onroad.radar_tracks import format_radar_tracks_onroad_columns, format_radar_tracks_onroad_status, radar_track_color +from openpilot.selfdrive.ui.sunnypilot.onroad.radar_tracks import format_radar_tracks_onroad_columns, radar_track_color def color_tuple(color): @@ -29,23 +29,21 @@ def test_radar_track_stationary_world_object_is_white(): assert color_tuple(radar_track_color(-18.9, v_ego=20.0)) == (0, 140, 255, 255) -def test_format_radar_tracks_status_none(): +def test_format_radar_tracks_columns_none(): live_tracks = car.RadarData.new_message() - assert format_radar_tracks_onroad_status(live_tracks) == "none" assert format_radar_tracks_onroad_columns(live_tracks) == ("", "none") -def test_format_radar_tracks_status_range_and_count(): +def test_format_radar_tracks_columns_range_and_count(): live_tracks = car.RadarData.new_message() live_tracks.trackSources = [{"startAddress": 0x500, "endAddress": 0x51F, "bus": 1, "trackCount": 2}] live_tracks.init("points", 2) - assert format_radar_tracks_onroad_status(live_tracks) == "500-51F 2" assert format_radar_tracks_onroad_columns(live_tracks) == ("500-51F", "2") -def test_format_radar_tracks_status_deduplicates_and_sorts_ranges(): +def test_format_radar_tracks_columns_sorts_ranges(): live_tracks = car.RadarData.new_message() live_tracks.trackSources = [ {"startAddress": 0x500, "endAddress": 0x51F, "bus": 2, "trackCount": 3}, @@ -54,7 +52,6 @@ def test_format_radar_tracks_status_deduplicates_and_sorts_ranges(): ] live_tracks.init("points", 1) - assert format_radar_tracks_onroad_status(live_tracks) == "210-21F 1\n500-51F 2\n500-51F 3" assert format_radar_tracks_onroad_columns(live_tracks) == ( "210-21F\n500-51F\n500-51F", "1\n2\n3",