spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add branch name to startup master alert (#23782) 

* add branch name to startup master alert

* still orange

* update refs
pull/23783/head
Adeeb Shihadeh 2022-02-16 20:27:07 -08:00 committed by GitHub
parent 1c9bf108af
commit ff965c772b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
selfdrive/controls/lib/events.py
View File

@ -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

2
selfdrive/test/process_replay/ref_commit
View File

@ -1 +1 @@
7077009f076000a475ec6b56e2f711e78daa876e
ec35d9040244398405758f4419839ca19fb98d3d