diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index fbce9460a..235d9e10b 100644 --- a/selfdrive/controls/lib/events.py +++ b/selfdrive/controls/lib/events.py @@ -6,6 +6,7 @@ import cereal.messaging as messaging from common.realtime import DT_CTRL from selfdrive.config import Conversions as CV from selfdrive.locationd.calibrationd import MIN_SPEED_FILTER +from selfdrive.version import get_short_branch AlertSize = log.ControlsState.AlertSize AlertStatus = log.ControlsState.AlertStatus @@ -206,7 +207,6 @@ def soft_disable_alert(alert_text_2: str) -> AlertCallbackType: return SoftDisableAlert(alert_text_2) return func - def user_soft_disable_alert(alert_text_2: str) -> AlertCallbackType: def func(CP: car.CarParams, sm: messaging.SubMaster, metric: bool, soft_disable_time: int) -> Alert: if soft_disable_time < int(0.5 / DT_CTRL): @@ -214,6 +214,8 @@ def user_soft_disable_alert(alert_text_2: str) -> AlertCallbackType: return UserSoftDisableAlert(alert_text_2) return func +def startup_master_alert(CP: car.CarParams, sm: messaging.SubMaster, metric: bool, soft_disable_time: int) -> Alert: + return StartupAlert("WARNING: This branch is not tested", get_short_branch(""), alert_status=AlertStatus.userPrompt) def below_engage_speed_alert(CP: car.CarParams, sm: messaging.SubMaster, metric: bool, soft_disable_time: int) -> Alert: return NoEntryAlert(f"Speed Below {get_display_speed(CP.minEnableSpeed, metric)}") @@ -280,8 +282,7 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = { }, EventName.startupMaster: { - ET.PERMANENT: StartupAlert("WARNING: This branch is not tested", - alert_status=AlertStatus.userPrompt), + ET.PERMANENT: startup_master_alert, }, # Car is recognized, but marked as dashcam only diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index 8a21a9392..549274030 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -7077009f076000a475ec6b56e2f711e78daa876e \ No newline at end of file +ec35d9040244398405758f4419839ca19fb98d3d \ No newline at end of file