change events

This commit is contained in:
Jason Wen
2024-11-13 19:42:05 -05:00
parent e3e65de225
commit aa0f588248
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -132,7 +132,7 @@ struct OnroadEvent @0xc4fa6047f024e718 {
manualSteeringRequired @95;
manualLongitudinalRequired @96;
silentPedalPressed @97;
silentButtonEnable @98;
silentLkasEnable @98;
silentBrakeHold @99;
silentWrongGear @100;
+1 -1
View File
@@ -997,7 +997,7 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = {
visual_alert=VisualAlert.brakePressed),
},
EventName.silentButtonEnable: {
EventName.silentLkasEnable: {
ET.ENABLE: Alert(
"",
"",
+3 -3
View File
@@ -57,7 +57,7 @@ class ModifiedAssistDrivingSystem:
if not CS.brakePressed and not CS.brakeHoldActive and not CS.parkingBrake and not CS.regenBraking:
if self.state_machine.state == State.paused and self.active:
self.selfdrive.events.add(EventName.silentButtonEnable)
self.selfdrive.events.add(EventName.silentLkasEnable)
for be in CS.buttonEvents:
if be.type == ButtonType.cancel:
@@ -68,10 +68,10 @@ class ModifiedAssistDrivingSystem:
if self.selfdrive.enabled_prev:
self.selfdrive.events.add(EventName.manualSteeringRequired)
else:
self.selfdrive.events.add(EventName.buttonCancel)
self.selfdrive.events.add(EventName.lkasDisable)
else:
if not self.selfdrive.enabled_prev:
self.selfdrive.events.add(EventName.buttonEnable)
self.selfdrive.events.add(EventName.lkasEnable)
self.selfdrive.events.remove(EventName.pedalPressed)