move stateless, common car events to car interface

pull/32394/head
Shane Smiskol 1 year ago
parent d28624fe5b
commit 80d8d3a2d2
  1. 4
      selfdrive/car/interfaces.py
  2. 6
      selfdrive/controls/controlsd.py

@ -282,6 +282,10 @@ class CarInterfaceBase(ABC):
events.add(EventName.accFaulted) events.add(EventName.accFaulted)
if cs_out.steeringPressed: if cs_out.steeringPressed:
events.add(EventName.steerOverride) events.add(EventName.steerOverride)
if cs_out.brakePressed and cs_out.standstill:
events.add(EventName.preEnableStandstill)
if cs_out.gasPressed:
events.add(EventName.gasPressedOverride)
# Handle button presses # Handle button presses
for b in cs_out.buttonEvents: for b in cs_out.buttonEvents:

@ -211,12 +211,6 @@ class Controls:
(CS.regenBraking and (not self.CS_prev.regenBraking or not CS.standstill)): (CS.regenBraking and (not self.CS_prev.regenBraking or not CS.standstill)):
self.events.add(EventName.pedalPressed) self.events.add(EventName.pedalPressed)
if CS.brakePressed and CS.standstill:
self.events.add(EventName.preEnableStandstill)
if CS.gasPressed:
self.events.add(EventName.gasPressedOverride)
if not self.CP.notCar: if not self.CP.notCar:
self.events.add_from_msg(self.sm['driverMonitoringState'].events) self.events.add_from_msg(self.sm['driverMonitoringState'].events)

Loading…
Cancel
Save