no longer needed

This commit is contained in:
Jason Wen
2024-11-16 19:28:13 -05:00
parent 6106fe3d2e
commit fb5f8a74ac
2 changed files with 3 additions and 9 deletions
+2 -2
View File
@@ -187,8 +187,8 @@ struct OnroadEvent @0xc4fa6047f024e718 {
# sunnypilot
lkasEnable @151;
lkasDisable @152;
manualSteeringRequired @153;
manualLongitudinalRequired @154;
manualSteeringRequired @153; # TODO-SP: remove before merging
manualLongitudinalRequired @154; # TODO-SP: remove before merging
silentPedalPressed @155;
silentLkasEnable @156;
silentBrakeHold @157;
+1 -7
View File
@@ -73,15 +73,9 @@ class ModularAssistiveDrivingSystem:
self.selfdrive.events.add(EventName.lkasEnable)
for be in CS.buttonEvents:
if be.type == ButtonType.cancel:
if not self.selfdrive.enabled and self.selfdrive.enabled_prev:
self.selfdrive.events.add(EventName.manualLongitudinalRequired)
if be.type == ButtonType.lkas and be.pressed and (CS.cruiseState.available or self.allow_always):
if self.active:
if self.selfdrive.enabled:
self.selfdrive.events.add(EventName.manualSteeringRequired)
else:
self.selfdrive.events.add(EventName.lkasDisable)
self.selfdrive.events.add(EventName.lkasDisable)
else:
self.selfdrive.events.add(EventName.lkasEnable)