orange distracted alert is now continuous (#1412)

old-commit-hash: 922055f464
5 years ago · 34eebc37b1
parent fe5d6177f0
commit 34eebc37b1
5 changed files with 7 additions and 6 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 65af4368cb84c03810af221f15e44b5e98ecafe9
+Subproject commit 8b347b0ac7a1acc73a9f83fe20ecd5d9fcf91d0a
--- a/selfdrive/assets/sounds/warning_2.wav
+++ b/selfdrive/assets/sounds/warning_2.wav
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e466c0086561f821386a072ff67a8b0d10bfcea6bd7426d086754ed5f15c691b
-size 52800
+oid sha256:29ea3f93348689ce82b2bb0815cc9c99bdf91aabd3be36076bbb601e3572e30e
+size 124708
--- a/selfdrive/controls/lib/alerts.py
+++ b/selfdrive/controls/lib/alerts.py
@ -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",
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@ -1 +1 @@
-d39595cf10a7813e55139320daa252278dd7567d
+53539b02abaa4d99c580448fcb8127d221c876af
--- a/selfdrive/ui/sound.cc
+++ b/selfdrive/ui/sound.cc
@ -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 },