From 922055f464fbb98ef8366f802897035aa5342333 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) --- cereal | 2 +- selfdrive/assets/sounds/warning_2.wav | Bin 52800 -> 124708 bytes selfdrive/controls/lib/alerts.py | 4 ++-- selfdrive/test/process_replay/ref_commit | 2 +- selfdrive/ui/sound.cc | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cereal b/cereal index 65af4368c..8b347b0ac 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 e9709d9fdb7b2634ac9f3347f231f6068fcf3fbc..4909f11982df1102aaf74995468c37c69ab793af 100644 GIT binary patch literal 124708 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 z2i8>hS6UwJ;4Q!n(F-Wc>YX!?mtX>~5`m+T4u~^%ARjW;>1!O~gK@czBEIWH%d!nVM!Sq^-&O`0!ir1x|nN48As%L2(bu~vC<`SkXuGrG7=nOj)g4H z6LWHp1K(&PVvRT(z#-(pmxJUEZpXayN3;C)~LHGoy6uV7}GljJwZ2G%2w5;y&KYDTUxCUYke^0G#t zwWPh3^1(S~I!dOmxuhS-isWye0Rhg>)iraR z^ftZR%sRw|>m120X>TAb;}iMLDiN~7g8J1v?E-CpFu19F6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m z6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m6a*9m c6a*9m6a*9m6a*9m6a*9m6a*9m{)@o>1J%M>Jpcdz delta 118 zcmZ2-j{U$KX7(UYH#duO3=`QEnRlFJ*r>hpY>ba*aEKTK1B0iZo4==@qc0bbU7lE! zmzkFyZ^V$9Vys{Wl65g=VQ>I4bby$LQGt~$Oy657B*@tt$Y%m#(-6-PBOr~U9RN-R B8wUUY diff --git a/selfdrive/controls/lib/alerts.py b/selfdrive/controls/lib/alerts.py index 80eaa7514..2b2b78aab 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 9ddc64f2c..95d12658b 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 9acf92523..87b8cdbac 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 },