sadmen
/
jyoung
mirror of https://github.com/jyoung8607/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

orange distracted alert is now continuous (#1412)

Browse Source 
old-commit-hash: 922055f464
vw-mqb-aeb
ZwX1616 6 years ago committed by GitHub
parent fe5d6177f0
commit 34eebc37b1
5 changed files with 7 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cereal
  2. 4
      selfdrive/assets/sounds/warning_2.wav
  3. 4
      selfdrive/controls/lib/alerts.py
  4. 2
      selfdrive/test/process_replay/ref_commit
  5. 1
      selfdrive/ui/sound.cc

2
cereal

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

4
selfdrive/assets/sounds/warning_2.wav
Unescape View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e466c0086561f821386a072ff67a8b0d10bfcea6bd7426d086754ed5f15c691b oid sha256:29ea3f93348689ce82b2bb0815cc9c99bdf91aabd3be36076bbb601e3572e30e
size 52800 size 124708

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

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

2
selfdrive/test/process_replay/ref_commit
Unescape View File

@ -1 +1 @@
d39595cf10a7813e55139320daa252278dd7567d 53539b02abaa4d99c580448fcb8127d221c876af

1
selfdrive/ui/sound.cc
Unescape View File

@ -32,6 +32,7 @@ sound_file sound_table[] = {
{ cereal_CarControl_HUDControl_AudibleAlert_chimeEngage, "../assets/sounds/engaged.wav", false }, { 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_chimeWarning1, "../assets/sounds/warning_1.wav", false },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeWarning2, "../assets/sounds/warning_2.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_chimeWarningRepeat, "../assets/sounds/warning_repeat.wav", true },
{ cereal_CarControl_HUDControl_AudibleAlert_chimeError, "../assets/sounds/error.wav", false }, { cereal_CarControl_HUDControl_AudibleAlert_chimeError, "../assets/sounds/error.wav", false },
{ cereal_CarControl_HUDControl_AudibleAlert_chimePrompt, "../assets/sounds/error.wav", false }, { cereal_CarControl_HUDControl_AudibleAlert_chimePrompt, "../assets/sounds/error.wav", false },

Write Preview
Loading…
Cancel
Save