  State = log.ControlsState.OpenpilotState
  
  # The event types that maintain the current state
  MAINTAIN_STATES = {State.enabled: None, State.disabled: None, State.softDisabling: ET.SOFT_DISABLE,
                     State.preEnabled: ET.PRE_ENABLE}
  ALL_STATES = tuple((state for state in State.schema.enumerants.values() if
                      state != State.overriding))  # TODO: remove overriding exception
  # The event types checked in DISABLED section of state machine
  ENABLE_EVENT_TYPES = (ET.ENABLE, ET.PRE_ENABLE)
  
  
  def make_event(event_types):
 
</s> remove           if not self.events.any(ET.OVERRIDE):
 </s> add           if self.events.any(ET.SOFT_DISABLE):
            self.state = State.softDisabling
            self.soft_disable_timer = int(SOFT_DISABLE_TIME / DT_CTRL)
            self.current_alert_types.append(ET.SOFT_DISABLE)
          elif not self.events.any(ET.OVERRIDE): </s> remove ENABLE_EVENT_TYPES = (ET.ENABLE, ET.PRE_ENABLE)
 </s> add ENABLE_EVENT_TYPES = (ET.ENABLE, ET.PRE_ENABLE, ET.OVERRIDE)
                   State.preEnabled: ET.PRE_ENABLE, State.overriding: ET.OVERRIDE}
ALL_STATES = tuple(State.schema.enumerants.values())
  State = log.ControlsState.OpenpilotState
  
  # The event types that maintain the current state
  MAINTAIN_STATES = {State.enabled: None, State.disabled: None, State.softDisabling: ET.SOFT_DISABLE,
                   State.preEnabled: ET.PRE_ENABLE, State.overriding: ET.OVERRIDE}
ALL_STATES = tuple(State.schema.enumerants.values())
                   State.preEnabled: ET.PRE_ENABLE, State.overriding: ET.OVERRIDE}
ALL_STATES = tuple(State.schema.enumerants.values())
                   State.preEnabled: ET.PRE_ENABLE, State.overriding: ET.OVERRIDE}
ALL_STATES = tuple(State.schema.enumerants.values())
  # The event types checked in DISABLED section of state machine
  ENABLE_EVENT_TYPES = (ET.ENABLE, ET.PRE_ENABLE)
  
  
  def make_event(event_types):
keep keep keep keep replace replace replace keep keep keep keep keep
 tests: add overriding to state machine test (#24131)

* add overriding to state machine test

* overriding should consider soft disable too 
selfdrive/controls/tests/test_state_machine.py