mawei/openpilot-evo
1
0
Fork 0
mirror of https://github.com/infiniteCable2/openpilot.git synced 2026-08-05 08:16:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "MADS: wrongCarMode alert only with selfdrive enable (#931)" (#933)

Browse Source 
* Revert "MADS: `wrongCarMode` alert only with selfdrive enable (#931)"

This reverts commit 6d516a7704.

* Reapply "MADS: `wrongCarMode` alert only with selfdrive enable (#931)"

This reverts commit c9487597e4ae4aa10a7111d963c5933d472bc88e.

* Reapply "MADS: `wrongCarMode` alert only with selfdrive enable (#931)"

This reverts commit c9487597e4ae4aa10a7111d963c5933d472bc88e.
This commit is contained in:
Jason Wen
2025-05-18 10:14:03 -04:00
committed by GitHub
parent 3aa9ddd3c7
commit a93e788401
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sunnypilot/mads/mads.py
+11 -5
View File
@@ -81,6 +81,13 @@ class ModularAssistiveDrivingSystem:
return False
def get_wrong_car_mode(self, alert_only: bool) -> None:
if alert_only:
if self.events.has(EventName.wrongCarMode):
self.replace_event(EventName.wrongCarMode, EventNameSP.wrongCarModeAlertOnly)
else:
self.events.remove(EventName.wrongCarMode)
def transition_paused_state(self):
if self.state_machine.state != State.paused:
self.events_sp.add(EventNameSP.silentLkasDisable)
@@ -121,6 +128,10 @@ class ModularAssistiveDrivingSystem:
self.events.remove(EventName.manualRestart)
selfdrive_enable_events = self.events.has(EventName.pcmEnable) or self.events.has(EventName.buttonEnable)
set_speed_btns_enable = any(be.type in SET_SPEED_BUTTONS for be in CS.buttonEvents)
# wrongCarMode alert only or actively block control
self.get_wrong_car_mode(selfdrive_enable_events or set_speed_btns_enable)
if selfdrive_enable_events:
if self.pedal_pressed_non_gas_pressed(CS):
@@ -160,11 +171,6 @@ class ModularAssistiveDrivingSystem:
self.events.remove(EventName.buttonCancel)
self.events.remove(EventName.pedalPressed)
self.events.remove(EventName.wrongCruiseMode)
if any(be.type in SET_SPEED_BUTTONS for be in CS.buttonEvents):
if self.events.has(EventName.wrongCarMode):
self.replace_event(EventName.wrongCarMode, EventNameSP.wrongCarModeAlertOnly)
else:
self.events.remove(EventName.wrongCarMode)
def update(self, CS: structs.CarState):
if not self.enabled_toggle: