From 82e5b382f166218ebe7de73b45e35015ddb84d0b Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Fri, 22 Apr 2022 20:32:36 -0700 Subject: [PATCH] longActive: consider longitudinal control (#24295) * consider longitudinal control * update refs old-commit-hash: f4d1703b424a9bc9864fb86e9feb705e8b947937 --- selfdrive/controls/controlsd.py | 2 +- selfdrive/test/process_replay/ref_commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 5bd75548f0..ab23af7b88 100755 --- 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 diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit index bfca5ef7eb..5110379746 100644 --- a/selfdrive/test/process_replay/ref_commit +++ b/selfdrive/test/process_replay/ref_commit @@ -1 +1 @@ -37aac3b4090fcc2f5a0e52c0eb4913706688d3fd \ No newline at end of file +fe7b24c1914046a3a7be19b6e812984e7e14301d \ No newline at end of file