mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-07-23 14:22:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Well im conflicted

Browse Source
This commit is contained in:
discountchubbs
2025-10-28 11:52:32 -07:00
parent 1c0b54a447
commit 35f03ae001
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunnypilot/navd/event_builder.py
+12 -6
View File
@@ -30,16 +30,22 @@ def _build_banner_message(nav_msg):
banner = m.instruction
dist = f'{int(m.distance)}m'
if m.type == 'arrive':
if m.type == 'arrive' or m.type == 'depart':
base_msg = banner
elif m.modifier == 'left' and 'Turn left' not in banner:
base_msg = f'Turn left onto {banner} in {dist}'
elif m.modifier == 'right' and 'Turn right' not in banner:
base_msg = f'Turn right onto {banner} in {dist}'
elif banner.startswith(('Continue', 'Drive', 'Head')):
base_msg = f'{banner} for {dist}'
# Not sure how I feel about these two below conditions right now.
# elif m.modifier == 'left' and 'Turn left' not in banner:
# base_msg = f'Turn left onto {banner} in {dist}'
# elif m.modifier == 'right' and 'Turn right' not in banner:
# base_msg = f'Turn right onto {banner} in {dist}'
elif 'Turn' in banner or 'Take' in banner or 'Make' in banner:
base_msg = f'{banner} in {dist}'
else:
base_msg = f'{banner} for {dist}'
base_msg = f'Continue on {banner} for {dist}'
return base_msg
sunnypilot/navd/tests/test_event_builder.py
+2 -2
View File
@@ -29,7 +29,7 @@ class TestEventBuilder:
events = build_navigation_events(MockSM(nav_msg))
expected = [{
'name': custom.OnroadEventSP.EventName.navigationBanner,
'message': 'Turn right onto West Esplanade Drive in 192m',
'message': 'Continue on West Esplanade Drive for 192m',
}]
assert events == expected
@@ -61,6 +61,6 @@ class TestEventBuilder:
events = build_navigation_events(MockSM(nav_msg))
expected = [{
'name': custom.OnroadEventSP.EventName.navigationBanner,
'message': '1234 Apple Way for 80m'
'message': 'Continue on 1234 Apple Way for 80m'
}]
assert events == expected