From 34eebc37b145dbd2f9a6ddcbdce6c7bd869703aa Mon Sep 17 00:00:00 2001 From: ZwX1616 Date: Thu, 23 Apr 2020 14:15:05 -0700 Subject: [PATCH] orange distracted alert is now continuous (#1412) old-commit-hash: 922055f464fbb98ef8366f802897035aa5342333 --- cereal | 2 +- selfdrive/assets/sounds/warning_2.wav | 4 ++-- selfdrive/controls/lib/alerts.py | 4 ++-- selfdrive/test/process_replay/ref_commit | 2 +- selfdrive/ui/sound.cc | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cereal b/cereal index 65af4368cb..8b347b0ac7 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 65af4368cb84c03810af221f15e44b5e98ecafe9 +Subproject commit 8b347b0ac7a1acc73a9f83fe20ecd5d9fcf91d0a diff --git a/selfdrive/assets/sounds/warning_2.wav b/selfdrive/assets/sounds/warning_2.wav index 2ae3dc4337..57ba4b7b67 100644 --- 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 diff --git a/selfdrive/controls/lib/alerts.py b/selfdrive/controls/lib/alerts.py index 80eaa7514f..2b2b78aab5 100644 --- 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", diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 9ddc64f2c6..95d12658be 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -d39595cf10a7813e55139320daa252278dd7567d \ No newline at end of file +53539b02abaa4d99c580448fcb8127d221c876af \ No newline at end of file diff --git a/selfdrive/ui/sound.cc b/selfdrive/ui/sound.cc index 9acf925238..87b8cdbace 100644 --- 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 },