Skip to content

ui: show alert when user flag (bookmark) pressed #34920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
May 9, 2025
Merged

ui: show alert when user flag (bookmark) pressed #34920

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d37a750
feat: Show alert on user flag event
TheSecurityDev Mar 22, 2025
f1da6a4
feat: Temporarily update border status on user flag to match connect …
TheSecurityDev Mar 22, 2025
11bcc2e
Merge branch 'commaai:master' into user-flag-alert
TheSecurityDev Mar 26, 2025
1777be8
Revert "feat: Temporarily update border status on user flag to match …
TheSecurityDev Mar 26, 2025
d288519
feat: Increase alert duration to 1.5 seconds
TheSecurityDev Mar 26, 2025
06ec78a
Merge branch 'commaai:master' into user-flag-alert
TheSecurityDev Mar 27, 2025
c090263
Merge branch 'commaai:master' into user-flag-alert
TheSecurityDev Apr 15, 2025
9baf21e
remove audible alert for bookmark event
TheSecurityDev Apr 15, 2025
f8f33e5
refactor: Use NormalPermamentAlert for user flag alert
TheSecurityDev Apr 15, 2025
4d0741b
Merge branch 'commaai:master' into user-flag-alert
TheSecurityDev May 7, 2025
b100536
fix: Update userFlag enum value in OnroadEvent struct
TheSecurityDev May 7, 2025
d55487e
fix: Handle userFlag event even in dashcam mode
TheSecurityDev May 7, 2025
1cc0db6
Merge branch 'master' of ssh://github.com/commaai/openpilot into user…
jyoung8607 May 9, 2025
ec491c7
don't need to ignore that anymore
jyoung8607 May 9, 2025
55726f0
remove 'userFlag' from ignore list
TheSecurityDev May 9, 2025
ad4c152
Merge branch 'user-flag-alert' of github.com:TheSecurityDev/openpilot…
jyoung8607 May 9, 2025
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
1 change: 1 addition & 0 deletions cereal/log.capnp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ struct OnroadEvent @0xc4fa6047f024e718 {
espActive @90;
personalityChanged @91;
aeb @92;
userFlag @94;

soundsUnavailableDEPRECATED @47;
}
Expand Down
10 changes: 9 additions & 1 deletion selfdrive/selfdrived/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ def personality_changed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging
# causing the connection to the panda to be lost
EventName.usbError: {
ET.SOFT_DISABLE: soft_disable_alert("USB Error: Reboot Your Device"),
ET.PERMANENT: NormalPermanentAlert("USB Error: Reboot Your Device", ""),
ET.PERMANENT: NormalPermanentAlert("USB Error: Reboot Your Device"),
ET.NO_ENTRY: NoEntryAlert("USB Error: Reboot Your Device"),
},

Expand Down Expand Up @@ -977,6 +977,14 @@ def personality_changed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging
ET.WARNING: personality_changed_alert,
},

EventName.userFlag: {
ET.PERMANENT: Alert(
"Bookmark Saved",
"",
AlertStatus.normal, AlertSize.small,
Priority.LOW, VisualAlert.none, AudibleAlert.prompt, 1.5
),
},
}


Expand Down
10 changes: 7 additions & 3 deletions selfdrive/selfdrived/selfdrived.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def __init__(self, CP=None):
# TODO: de-couple selfdrived with card/conflate on carState without introducing controls mismatches
self.car_state_sock = messaging.sub_sock('carState', timeout=20)

ignore = self.sensor_packets + self.gps_packets + ['alertDebug']
ignore = self.sensor_packets + self.gps_packets + ['alertDebug', 'userFlag']
if SIMULATION:
ignore += ['driverCameraState', 'managerState']
if REPLAY:
Expand All @@ -77,7 +77,7 @@ def __init__(self, CP=None):
self.sm = messaging.SubMaster(['deviceState', 'pandaStates', 'peripheralState', 'modelV2', 'liveCalibration',
'carOutput', 'driverMonitoringState', 'longitudinalPlan', 'livePose',
'managerState', 'liveParameters', 'radarState', 'liveTorqueParameters',
'controlsState', 'carControl', 'driverAssistance', 'alertDebug'] + \
'controlsState', 'carControl', 'driverAssistance', 'alertDebug', 'userFlag'] + \
self.camera_packets + self.sensor_packets + self.gps_packets,
ignore_alive=ignore, ignore_avg_freq=ignore,
ignore_valid=ignore, frequency=int(1/DT_CTRL))
Expand Down Expand Up @@ -359,13 +359,17 @@ def update_events(self, CS):
if self.sm['modelV2'].frameDropPerc > 20:
self.events.add(EventName.modeldLagging)

# decrement personality on distance button press
# Decrement personality on distance button press
if self.CP.openpilotLongitudinalControl:
if any(not be.pressed and be.type == ButtonType.gapAdjustCruise for be in CS.buttonEvents):
self.personality = (self.personality - 1) % 3
self.params.put_nonblocking('LongitudinalPersonality', str(self.personality))
self.events.add(EventName.personalityChanged)

# Check for user flag (bookmark) press
if self.sm.updated['userFlag']:
self.events.add(EventName.userFlag)

def data_sample(self):
car_state = messaging.recv_one(self.car_state_sock)
CS = car_state.carState if car_state else self.CS_prev
Expand Down
Loading