longActive: consider longitudinal control (#24295)

* consider longitudinal control * update refs
3 years ago · f4d1703b42
parent e8a9b9ed8c
commit f4d1703b42
2 changed files with 2 additions and 2 deletions
--- a/selfdrive/controls/controlsd.py
+++ b/selfdrive/controls/controlsd.py
@ -538,7 +538,7 @@ class Controls:
    # Check which actuators can be enabled
    CC.latActive = self.active and not CS.steerFaultTemporary and not CS.steerFaultPermanent and \
                     CS.vEgo > self.CP.minSteerSpeed and not CS.standstill
-    CC.longActive = self.active and not self.events.any(ET.OVERRIDE)
+    CC.longActive = self.active and not self.events.any(ET.OVERRIDE) and self.CP.openpilotLongitudinalControl

    actuators = CC.actuators
    actuators.longControlState = self.LoC.long_control_state
--- a/selfdrive/test/process_replay/ref_commit
+++ b/selfdrive/test/process_replay/ref_commit
@ -1 +1 @@
-37aac3b4090fcc2f5a0e52c0eb4913706688d3fd
+fe7b24c1914046a3a7be19b6e812984e7e14301d