sunnypilot: fix upstream conflicts

This commit is contained in:
Jason Wen
2023-08-02 13:13:37 -04:00
parent 35e8d675bc
commit 58e106c0d5
+1
View File
@@ -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(),