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

grey panda deprecation (#2406)

Browse source
This commit is contained in:
Adeeb Shihadeh 2020-10-26 23:09:06 -07:00 committed by GitHub
parent 9807361ef2
commit d92ec9642e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cereal

@ -1 +1 @@
Subproject commit b39fb46a72aa26b3220ea7d78476fede39ca361e
Subproject commit 58545fafa6a3bc25c2548c238f29eed6cc8c6a77

4
selfdrive/car/car_helpers.py
View file

@ -14,7 +14,7 @@ EventName = car.CarEvent.EventName
HwType = log.HealthData.HwType
def get_startup_event(car_recognized, controller_available):
def get_startup_event(car_recognized, controller_available, hw_type):
if comma_remote and tested_branch:
event = EventName.startup
else:
@ -24,6 +24,8 @@ def get_startup_event(car_recognized, controller_available):
event = EventName.startupNoCar
elif car_recognized and not controller_available:
event = EventName.startupNoControl
elif hw_type == HwType.greyPanda:
event = EventName.startupGreyPanda
return event

2
selfdrive/controls/controlsd.py
View file

@ -131,7 +131,7 @@ class Controls:
self.sm['dMonitoringState'].awarenessStatus = 1.
self.sm['dMonitoringState'].faceDetected = False
self.startup_event = get_startup_event(car_recognized, controller_available)
self.startup_event = get_startup_event(car_recognized, controller_available, hw_type)
if not sounds_available:
self.events.add(EventName.soundsUnavailable, static=True)

8
selfdrive/controls/lib/events.py
View file

@ -252,6 +252,14 @@ EVENTS: Dict[int, Dict[str, Union[Alert, Callable[[Any, messaging.SubMaster, boo
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
},
EventName.startupGreyPanda: {
ET.PERMANENT: Alert(
"WARNING: Grey panda is deprecated",
"Upgrade to comma two or black panda",
AlertStatus.userPrompt, AlertSize.mid,
Priority.LOWER, VisualAlert.none, AudibleAlert.none, 0., 0., 15.),
},
EventName.invalidGiraffeToyota: {
ET.PERMANENT: Alert(
"Unsupported Giraffe Configuration",