diff --git a/selfdrive/car/chrysler/interface.py b/selfdrive/car/chrysler/interface.py index f7d8b7c1d5..00aea4b557 100755 --- a/selfdrive/car/chrysler/interface.py +++ b/selfdrive/car/chrysler/interface.py @@ -100,8 +100,7 @@ class CarInterface(CarInterfaceBase): self.CS.mads_enabled = self.get_sp_cruise_main_state(ret) - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise, + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise, enable_buttons=(ButtonType.accelCruise, ButtonType.decelCruise, ButtonType.resumeCruise) if not self.CP.pcmCruiseSpeed else (ButtonType.accelCruise, ButtonType.decelCruise), resume_button=(ButtonType.resumeCruise,) if not self.CP.pcmCruiseSpeed else diff --git a/selfdrive/car/ford/interface.py b/selfdrive/car/ford/interface.py index bc8c8351c8..a519e5b20c 100644 --- a/selfdrive/car/ford/interface.py +++ b/selfdrive/car/ford/interface.py @@ -81,8 +81,7 @@ class CarInterface(CarInterfaceBase): self.CS.mads_enabled = self.get_sp_cruise_main_state(ret) - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise) + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise) if ret.cruiseState.available: if self.enable_mads: diff --git a/selfdrive/car/gm/interface.py b/selfdrive/car/gm/interface.py index 555a0ee24c..136457a5b7 100755 --- a/selfdrive/car/gm/interface.py +++ b/selfdrive/car/gm/interface.py @@ -227,8 +227,7 @@ class CarInterface(CarInterfaceBase): if any(b.type == ButtonType.accelCruise and b.pressed for b in self.CS.button_events): self.CS.accEnabled = True - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise) + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise) if ret.cruiseState.available: if self.enable_mads: diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 34b69fb137..f9d4636bbd 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -269,8 +269,7 @@ class CarInterface(CarInterfaceBase): self.CS.mads_enabled = self.get_sp_cruise_main_state(ret) - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise) + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise) if ret.cruiseState.available: if self.enable_mads: diff --git a/selfdrive/car/hyundai/interface.py b/selfdrive/car/hyundai/interface.py index a04bfc3699..67696df448 100644 --- a/selfdrive/car/hyundai/interface.py +++ b/selfdrive/car/hyundai/interface.py @@ -212,8 +212,7 @@ class CarInterface(CarInterfaceBase): self.CS.mads_enabled = self.get_sp_cruise_main_state(ret) - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise) + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise) if ret.cruiseState.available: if not self.CP.pcmCruiseSpeed: diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 9d66b62abc..098f81f816 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -558,12 +558,13 @@ class CarInterfaceBase(ABC): return mads_enabled - def get_sp_v_cruise_non_pcm_state(self, cs_out, acc_enabled, button_events, vCruise, + def get_sp_v_cruise_non_pcm_state(self, cs_out, vCruise, enable_buttons=(ButtonType.accelCruise, ButtonType.decelCruise), resume_button=(ButtonType.accelCruise, ButtonType.resumeCruise)): + acc_enabled = self.CS.accEnabled if cs_out.cruiseState.available: - for b in button_events: + for b in self.CS.button_events: if not self.CP.pcmCruise or not self.CP.pcmCruiseSpeed: if b.type in enable_buttons and not b.pressed: acc_enabled = True diff --git a/selfdrive/car/mazda/interface.py b/selfdrive/car/mazda/interface.py index 78b7d3c589..d2317af213 100755 --- a/selfdrive/car/mazda/interface.py +++ b/selfdrive/car/mazda/interface.py @@ -47,8 +47,7 @@ class CarInterface(CarInterfaceBase): self.CS.mads_enabled = self.get_sp_cruise_main_state(ret) - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise) + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise) if ret.cruiseState.available: if self.enable_mads: diff --git a/selfdrive/car/volkswagen/interface.py b/selfdrive/car/volkswagen/interface.py index a9ad59ef39..386f6dcd4c 100644 --- a/selfdrive/car/volkswagen/interface.py +++ b/selfdrive/car/volkswagen/interface.py @@ -116,8 +116,7 @@ class CarInterface(CarInterfaceBase): self.CS.mads_enabled = self.get_sp_cruise_main_state(ret) - self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, self.CS.accEnabled, - self.CS.button_events, c.vCruise, + self.CS.accEnabled = self.get_sp_v_cruise_non_pcm_state(ret, c.vCruise, enable_buttons=(ButtonType.setCruise, ButtonType.resumeCruise)) if ret.cruiseState.available: