From ab66589a4624b59d90eafbf1e1cb0c5760e0feea Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Tue, 23 Jun 2020 10:46:33 -0700
Subject: [PATCH] fix engage/disengage sounds

old-commit-hash: 51b7dc0e385945faf0341c52b14555e75e804d04
---
 selfdrive/controls/lib/events.py         | 2 +-
 selfdrive/test/process_replay/ref_commit | 2 +-
 selfdrive/ui/ui.cc                       | 3 ++-
 selfdrive/ui/ui.hpp                      | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py
index 3831946f5b..3970a57bd7 100644
--- a/selfdrive/controls/lib/events.py
+++ b/selfdrive/controls/lib/events.py
@@ -75,7 +75,7 @@ class Events:
             alert = alert(*callback_args)
 
           if DT_CTRL * (self.events_prev[e] + 1) >= alert.creation_delay:
-            alert.alert_type = EVENT_NAME[e]
+            alert.alert_type = f"{EVENT_NAME[e]}/{et}"
             ret.append(alert)
     return ret
 
diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
index be6523e27b..31fdb6ce07 100644
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-a8b50cfc06473f66896b3f74a562263d3cccec36
\ No newline at end of file
+12861083f7fdcfd2876d7f8102f1853a3248e2a7
\ No newline at end of file
diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc
index 2b8b97cff8..f352adf699 100644
--- a/selfdrive/ui/ui.cc
+++ b/selfdrive/ui/ui.cc
@@ -308,7 +308,7 @@ void handle_message(UIState *s, SubMaster &sm) {
     if (!scene.frontview){ s->controls_seen = true; }
 
     auto alert_sound = scene.controls_state.getAlertSound();
-    if (scene.alert_text2.compare(scene.controls_state.getAlertText2()) != 0) {
+    if (scene.alert_type.compare(scene.controls_state.getAlertType()) != 0) {
       if (alert_sound == AudibleAlert::NONE) {
         s->sound.stop();
       } else {
@@ -318,6 +318,7 @@ void handle_message(UIState *s, SubMaster &sm) {
     scene.alert_text1 = scene.controls_state.getAlertText1();
     scene.alert_text2 = scene.controls_state.getAlertText2();
     scene.alert_size = scene.controls_state.getAlertSize();
+    scene.alert_type = scene.controls_state.getAlertType();
     auto alertStatus = scene.controls_state.getAlertStatus();
     if (alertStatus == cereal::ControlsState::AlertStatus::USER_PROMPT) {
       update_status(s, STATUS_WARNING);
diff --git a/selfdrive/ui/ui.hpp b/selfdrive/ui/ui.hpp
index 07f2428ca6..8ee48ed4d9 100644
--- a/selfdrive/ui/ui.hpp
+++ b/selfdrive/ui/ui.hpp
@@ -118,6 +118,7 @@ typedef struct UIScene {
 
   std::string alert_text1;
   std::string alert_text2;
+  std::string alert_type;
   cereal::ControlsState::AlertSize alert_size;
 
   // Used to show gps planner status