From 70b2222ede19dd6f7aa65051dc11b6ab941bf168 Mon Sep 17 00:00:00 2001
From: dragonpilot <dgnpilot@gmail.com>
Date: Tue, 27 Aug 2019 17:13:12 +1000
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=AF=E8=AA=BF=E8=AD=A6?=
 =?UTF-8?q?=E7=A4=BA=E9=9F=B3=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/params.py                             |  1 +
 selfdrive/dragonpilot/dragonconf/__init__.py |  1 +
 selfdrive/ui/ui.c                            | 21 +++++++++++++-------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/common/params.py b/common/params.py
index 1e128db91..776e3b337 100755
--- a/common/params.py
+++ b/common/params.py
@@ -117,6 +117,7 @@ keys = {
   "DragonRunMixplorer": [TxType.PERSISTENT],
   "DragonSteeringMonitorTimer": [TxType.PERSISTENT],
   "DragonCameraOffset": [TxType.PERSISTENT],
+  "DragonUIVolumeBoost": [TxType.PERSISTENT],
 }
 
 
diff --git a/selfdrive/dragonpilot/dragonconf/__init__.py b/selfdrive/dragonpilot/dragonconf/__init__.py
index 070e44810..b8efbd4a2 100644
--- a/selfdrive/dragonpilot/dragonconf/__init__.py
+++ b/selfdrive/dragonpilot/dragonconf/__init__.py
@@ -37,6 +37,7 @@ default_conf = {
   'DragonRunMixplorer': '0',
   'DragonSteeringMonitorTimer': '3',
   'DragonCameraOffset': '6',
+  'DragonUIVolumeBoost': '0',
 }
 
 deprecated_conf = {
diff --git a/selfdrive/ui/ui.c b/selfdrive/ui/ui.c
index 531239ece..0db38012c 100644
--- a/selfdrive/ui/ui.c
+++ b/selfdrive/ui/ui.c
@@ -300,6 +300,7 @@ typedef struct UIState {
   int dragon_ui_dev_timeout;
   int dragon_ui_dev_mini_timeout;
   int dragon_enable_dashcam_timeout;
+  int dragon_ui_volume_boost_timeout;
 
   bool dragon_ui_event;
   bool dragon_ui_maxspeed;
@@ -307,6 +308,7 @@ typedef struct UIState {
   bool dragon_ui_dev;
   bool dragon_ui_dev_mini;
   bool dragon_enable_dashcam;
+  float dragon_ui_volume_boost;
 
 } UIState;
 
@@ -680,6 +682,7 @@ static void ui_init_vision(UIState *s, const VisionStreamBufs back_bufs,
   read_param_bool(&s->dragon_ui_dev, "DragonUIDev");
   read_param_bool(&s->dragon_ui_dev_mini, "DragonUIDevMini");
   read_param_bool(&s->dragon_enable_dashcam, "DragonEnableDashcam");
+  read_param_float(&s->dragon_ui_volume_boost, "DragonUIVolumeBoost");
 
 
   // Set offsets so params don't get read at the same time
@@ -687,13 +690,14 @@ static void ui_init_vision(UIState *s, const VisionStreamBufs back_bufs,
   s->is_metric_timeout = UI_FREQ / 2;
   s->limit_set_speed_timeout = UI_FREQ;
 
-  // dragonpilot, 1 sec
-  s->dragon_ui_event_timeout = 100;
-  s->dragon_ui_maxspeed_timeout = 100;
-  s->dragon_ui_face_timeout = 100;
-  s->dragon_ui_dev_timeout = 100;
-  s->dragon_ui_dev_mini_timeout = 100;
-  s->dragon_enable_dashcam_timeout = 100;
+  // dragonpilot, 1hz
+  s->dragon_ui_event_timeout = UI_FREQ * 3;
+  s->dragon_ui_maxspeed_timeout = UI_FREQ * 3;
+  s->dragon_ui_face_timeout = UI_FREQ * 3;
+  s->dragon_ui_dev_timeout = UI_FREQ * 3;
+  s->dragon_ui_dev_mini_timeout = UI_FREQ * 3;
+  s->dragon_enable_dashcam_timeout = UI_FREQ * 3;
+  s->dragon_ui_volume_boost_timeout = UI_FREQ * 3;
 }
 
 static void ui_draw_transformed_box(UIState *s, uint32_t color) {
@@ -2643,6 +2647,9 @@ int main(int argc, char* argv[]) {
       s->volume_timeout--;
     } else {
       int volume = min(MAX_VOLUME, MIN_VOLUME + s->scene.v_ego / 5);  // up one notch every 5 m/s
+      if (s->dragon_ui_volume_boost > 0 || s->dragon_ui_volume_boost < 0) {
+        volume = volume * (1+dragon_ui_volume_boost/100)
+      }
       set_volume(s, volume);
     }