From bd269defb3b7f7dd7fc43fa69e289fd126b258a1 Mon Sep 17 00:00:00 2001 From: James Vecellio Date: Tue, 21 Oct 2025 16:18:27 -0700 Subject: [PATCH 1/3] oopsie --- sunnypilot/navd/navigationd.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sunnypilot/navd/navigationd.py b/sunnypilot/navd/navigationd.py index ff5eba9980..862f322034 100755 --- a/sunnypilot/navd/navigationd.py +++ b/sunnypilot/navd/navigationd.py @@ -90,25 +90,25 @@ class Navigationd: return banner_instructions, progress, nav_data def _build_navigation_message(self, banner_instructions, progress, nav_data): - msg = custom.Navigationd.new_message() - msg.upcomingTurn = nav_data.get('upcoming_turn', 'none') - msg.currentSpeedLimit = nav_data.get('current_speed_limit', 0) - msg.bannerInstructions = banner_instructions - msg.distanceToNextTurn = nav_data.get('distance_to_next_turn', 0.0) - msg.distanceToEndOfStep = nav_data.get('distance_to_end_of_step', 0.0) - msg.routeProgressPercent = nav_data.get('route_progress_percent', 0.0) - msg.distanceFromRoute = nav_data.get('distance_from_route', 0.0) - msg.routePositionCumulative = nav_data.get('route_position_cumulative', 0.0) - msg.totalDistanceRemaining = progress['total_distance_remaining'] if progress else 0.0 - msg.totalTimeRemaining = progress['total_time_remaining'] if progress else 0.0 - msg.valid = self.valid + msg = messaging.new_message('navigationd') + msg.navigationd.upcomingTurn = nav_data.get('upcoming_turn', 'none') + msg.navigationd.currentSpeedLimit = nav_data.get('current_speed_limit', 0) + msg.navigationd.bannerInstructions = banner_instructions + msg.navigationd.distanceToNextTurn = nav_data.get('distance_to_next_turn', 0.0) + msg.navigationd.distanceToEndOfStep = nav_data.get('distance_to_end_of_step', 0.0) + msg.navigationd.routeProgressPercent = nav_data.get('route_progress_percent', 0.0) + msg.navigationd.distanceFromRoute = nav_data.get('distance_from_route', 0.0) + msg.navigationd.routePositionCumulative = nav_data.get('route_position_cumulative', 0.0) + msg.navigationd.totalDistanceRemaining = progress['total_distance_remaining'] if progress else 0.0 + msg.navigationd.totalTimeRemaining = progress['total_time_remaining'] if progress else 0.0 + msg.navigationd.valid = self.valid all_maneuvers = ( [custom.Navigationd.Maneuver.new_message(distance=m['distance'], type=m['type'], modifier=m['modifier']) for m in progress['all_maneuvers']] if progress else [] ) - msg.allManeuvers = all_maneuvers + msg.navigationd.allManeuvers = all_maneuvers return msg From 551b4dea31202948c3c3427e46dd807cee01d6ff Mon Sep 17 00:00:00 2001 From: James Vecellio Date: Tue, 21 Oct 2025 16:18:27 -0700 Subject: [PATCH 2/3] oopsie --- sunnypilot/navd/navigationd.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sunnypilot/navd/navigationd.py b/sunnypilot/navd/navigationd.py index ff5eba9980..862f322034 100755 --- a/sunnypilot/navd/navigationd.py +++ b/sunnypilot/navd/navigationd.py @@ -90,25 +90,25 @@ class Navigationd: return banner_instructions, progress, nav_data def _build_navigation_message(self, banner_instructions, progress, nav_data): - msg = custom.Navigationd.new_message() - msg.upcomingTurn = nav_data.get('upcoming_turn', 'none') - msg.currentSpeedLimit = nav_data.get('current_speed_limit', 0) - msg.bannerInstructions = banner_instructions - msg.distanceToNextTurn = nav_data.get('distance_to_next_turn', 0.0) - msg.distanceToEndOfStep = nav_data.get('distance_to_end_of_step', 0.0) - msg.routeProgressPercent = nav_data.get('route_progress_percent', 0.0) - msg.distanceFromRoute = nav_data.get('distance_from_route', 0.0) - msg.routePositionCumulative = nav_data.get('route_position_cumulative', 0.0) - msg.totalDistanceRemaining = progress['total_distance_remaining'] if progress else 0.0 - msg.totalTimeRemaining = progress['total_time_remaining'] if progress else 0.0 - msg.valid = self.valid + msg = messaging.new_message('navigationd') + msg.navigationd.upcomingTurn = nav_data.get('upcoming_turn', 'none') + msg.navigationd.currentSpeedLimit = nav_data.get('current_speed_limit', 0) + msg.navigationd.bannerInstructions = banner_instructions + msg.navigationd.distanceToNextTurn = nav_data.get('distance_to_next_turn', 0.0) + msg.navigationd.distanceToEndOfStep = nav_data.get('distance_to_end_of_step', 0.0) + msg.navigationd.routeProgressPercent = nav_data.get('route_progress_percent', 0.0) + msg.navigationd.distanceFromRoute = nav_data.get('distance_from_route', 0.0) + msg.navigationd.routePositionCumulative = nav_data.get('route_position_cumulative', 0.0) + msg.navigationd.totalDistanceRemaining = progress['total_distance_remaining'] if progress else 0.0 + msg.navigationd.totalTimeRemaining = progress['total_time_remaining'] if progress else 0.0 + msg.navigationd.valid = self.valid all_maneuvers = ( [custom.Navigationd.Maneuver.new_message(distance=m['distance'], type=m['type'], modifier=m['modifier']) for m in progress['all_maneuvers']] if progress else [] ) - msg.allManeuvers = all_maneuvers + msg.navigationd.allManeuvers = all_maneuvers return msg From 450fcd4d554ec0fe3aebc1213f83afc71620452c Mon Sep 17 00:00:00 2001 From: discountchubbs Date: Tue, 21 Oct 2025 16:25:30 -0700 Subject: [PATCH 3/3] oopsie part two lol --- sunnypilot/navd/tests/test_navigationd.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sunnypilot/navd/tests/test_navigationd.py b/sunnypilot/navd/tests/test_navigationd.py index b626b02284..889110f79e 100644 --- a/sunnypilot/navd/tests/test_navigationd.py +++ b/sunnypilot/navd/tests/test_navigationd.py @@ -46,10 +46,10 @@ class TestNavigationd: if self.is_darwin: nav = Navigationd() msg = nav._build_navigation_message('', None, {}) - assert msg.bannerInstructions == '' - assert msg.totalDistanceRemaining == 0.0 - assert msg.totalTimeRemaining == 0.0 - assert msg.valid is False + assert msg.navigationd.bannerInstructions == '' + assert msg.navigationd.totalDistanceRemaining == 0.0 + assert msg.navigationd.totalTimeRemaining == 0.0 + assert msg.navigationd.valid is False else: sm = messaging.SubMaster(['navigationd']) nav = Navigationd() @@ -59,7 +59,7 @@ class TestNavigationd: sm.update() received_msg = sm['navigationd'] - assert received_msg.bannerInstructions == msg.bannerInstructions - assert received_msg.totalDistanceRemaining == msg.totalDistanceRemaining - assert received_msg.totalTimeRemaining == msg.totalTimeRemaining - assert received_msg.valid == msg.valid + assert received_msg.bannerInstructions == msg.navigationd.bannerInstructions + assert received_msg.totalDistanceRemaining == msg.navigationd.totalDistanceRemaining + assert received_msg.totalTimeRemaining == msg.navigationd.totalTimeRemaining + assert received_msg.valid == msg.navigationd.valid