From 92abd64efd973ae2df13ad2f326e7737d7c23359 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Tue, 5 Sep 2023 22:30:15 -0400 Subject: [PATCH] Upstream merge fixes --- selfdrive/controls/lib/speed_limit_controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfdrive/controls/lib/speed_limit_controller.py b/selfdrive/controls/lib/speed_limit_controller.py index a50b44cd10..58b54e8142 100644 --- a/selfdrive/controls/lib/speed_limit_controller.py +++ b/selfdrive/controls/lib/speed_limit_controller.py @@ -412,7 +412,7 @@ class SpeedLimitController(): _car_state = sm['carState'] self._op_enabled = enabled and sm['controlsState'].enabled and _car_state.cruiseState.enabled and \ not (_car_state.brakePressed and (not self._brake_pressed_prev or not _car_state.standstill)) and \ - not events.any(ET.OVERRIDE_LONGITUDINAL) + not events.contains(ET.OVERRIDE_LONGITUDINAL) self._v_ego = v_ego self._a_ego = a_ego self._v_cruise_setpoint = v_cruise_setpoint