retropilot
/
openpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

orange distracted alert is now continuous (#1412)

albatross
ZwX1616 2020-04-23 14:15:05 -07:00 committed by GitHub
parent 24ae93f965
commit 922055f464
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cereal

@ -1 +1 @@
Subproject commit 65af4368cb84c03810af221f15e44b5e98ecafe9
Subproject commit 8b347b0ac7a1acc73a9f83fe20ecd5d9fcf91d0a

BIN
selfdrive/assets/sounds/warning_2.wav
View File

Binary file not shown.

4
selfdrive/controls/lib/alerts.py
View File

@ -120,7 +120,7 @@ ALERTS = [
"KEEP EYES ON ROAD",
"Driver Appears Distracted",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2Repeat, .1, .1, .1),
Alert(
"driverDistracted",
@ -141,7 +141,7 @@ ALERTS = [
"TOUCH STEERING WHEEL",
"Driver Is Unresponsive",
AlertStatus.userPrompt, AlertSize.mid,
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2, .1, .1, .1),
Priority.MID, VisualAlert.steerRequired, AudibleAlert.chimeWarning2Repeat, .1, .1, .1),
Alert(
"driverUnresponsive",

2
selfdrive/test/process_replay/ref_commit
View File

@ -1 +1 @@
d39595cf10a7813e55139320daa252278dd7567d
53539b02abaa4d99c580448fcb8127d221c876af

1
selfdrive/ui/sound.cc
View File

@ -32,6 +32,7 @@ sound_file sound_table[] = {
{ cereal_CarControl_HUDControl_AudibleAlert_chimeEngage, "../assets/sounds/engaged.wav", false },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeWarning1, "../assets/sounds/warning_1.wav", false },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeWarning2, "../assets/sounds/warning_2.wav", false },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeWarning2Repeat, "../assets/sounds/warning_2.wav", true },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeWarningRepeat, "../assets/sounds/warning_repeat.wav", true },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeError, "../assets/sounds/error.wav", false },
{ cereal_CarControl_HUDControl_AudibleAlert_chimePrompt, "../assets/sounds/error.wav", false },