From f61add3913bd8213fee9965994b2b27ad998e8d7 Mon Sep 17 00:00:00 2001 From: dragonpilot Date: Wed, 28 Aug 2019 09:50:16 +1000 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9F=B3=E9=87=8F=E8=AA=BF?= =?UTF-8?q?=E6=95=B4=20logic?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- selfdrive/ui/ui.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/selfdrive/ui/ui.c b/selfdrive/ui/ui.c index d01b115d0..c4fe9d098 100644 --- a/selfdrive/ui/ui.c +++ b/selfdrive/ui/ui.c @@ -348,6 +348,10 @@ static void set_awake(UIState *s, bool awake) { static void set_volume(UIState *s, int volume) { char volume_change_cmd[64]; + if (s->dragon_ui_volume_boost > 0 || s->dragon_ui_volume_boost < 0) { + volume = volume * (1 + s->dragon_ui_volume_boost /100); + volume = volume > MAX_VOLUME? MAX_VOLUME : volume; + } sprintf(volume_change_cmd, "service call audio 3 i32 3 i32 %d i32 1", volume); // 5 second timeout at 60fps @@ -2647,9 +2651,6 @@ 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 + s->dragon_ui_volume_boost /100); - } set_volume(s, volume); }