From 58e106c0d556c880818b3bbbee2c70490b4a2807 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Wed, 2 Aug 2023 13:13:37 -0400 Subject: [PATCH] sunnypilot: fix upstream conflicts --- selfdrive/ui/ui.h | 1 + 1 file changed, 1 insertion(+) diff --git a/selfdrive/ui/ui.h b/selfdrive/ui/ui.h index 2d8fe02e31..1e7aac47d1 100644 --- a/selfdrive/ui/ui.h +++ b/selfdrive/ui/ui.h @@ -55,6 +55,7 @@ struct Alert { if (display_debug_alert_frame > 0 && (sm.frame - display_debug_alert_frame) <= 1 * UI_FREQ) { return {"Debug snapshot collected", "", "debugTapDetected", cereal::ControlsState::AlertSize::SMALL, + cereal::ControlsState::AlertStatus::NORMAL, AudibleAlert::WARNING_SOFT}; } else if (controls_frame >= started_frame) { // Don't get old alert. alert = {cs.getAlertText1().cStr(), cs.getAlertText2().cStr(),