less harsh steering unavailable alert when overriding (#20718)

* less harsh steering unavailable alert when overriding

* just steer

* 1s

* orange

* update refs
old-commit-hash: 836668f105
This commit is contained in:
Adeeb Shihadeh
2021-04-20 21:01:28 -07:00
committed by GitHub
parent 8c72eac7fb
commit cc29fdfed2
4 changed files with 14 additions and 3 deletions
+1 -1
Submodule cereal updated: b39c6fc26d...9c56c531c6
+4 -1
View File
@@ -119,7 +119,10 @@ class CarInterfaceBase():
if cs_out.steerError:
events.add(EventName.steerUnavailable)
elif cs_out.steerWarning:
events.add(EventName.steerTempUnavailable)
if cs_out.steeringPressed:
events.add(EventName.steerTempUnavailableUserOverride)
else:
events.add(EventName.steerTempUnavailable)
# Disable on rising edge of gas or brake. Also disable on brake when speed > 0.
# Optionally allow to press gas at zero speed to resume.
+8
View File
@@ -351,6 +351,14 @@ EVENTS: Dict[int, Dict[str, Union[Alert, Callable[[Any, messaging.SubMaster, boo
Priority.LOWEST, VisualAlert.steerRequired, AudibleAlert.none, .0, .0, .1),
},
EventName.steerTempUnavailableUserOverride: {
ET.WARNING: Alert(
"Steering Temporarily Unavailable",
"",
AlertStatus.userPrompt, AlertSize.small,
Priority.LOW, VisualAlert.steerRequired, AudibleAlert.chimePrompt, 1., 1., 1.),
},
EventName.preDriverDistracted: {
ET.WARNING: Alert(
"KEEP EYES ON ROAD: Driver Distracted",
+1 -1
View File
@@ -1 +1 @@
a3186f6a218e5f031239a60e218049a56c5636a6
bb1af9fc73c15967a4160d8899f2688b059627bf