mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-09-28 02:13:52 +08:00
sunnypilot: fix upstream conflicts
This commit is contained in:
@@ -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(),
|
||||
|
||||
Reference in New Issue
Block a user