From 40deea7d7bdd2176f897c203657e45bfd7fd1fcc Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Thu, 2 Jun 2022 22:06:01 -0700 Subject: [PATCH] Honda: fix enabling before PCM (#24715) * Don't enable for pcmCruise Honda * make it a no entry as well * do in another PR --- selfdrive/car/__init__.py | 7 ++++--- selfdrive/car/honda/interface.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/selfdrive/car/__init__.py b/selfdrive/car/__init__.py index 806a060f97..c77e40daaf 100644 --- a/selfdrive/car/__init__.py +++ b/selfdrive/car/__init__.py @@ -24,12 +24,13 @@ def create_button_event(cur_but: int, prev_but: int, buttons_dict: Dict[int, cap return be -def create_button_enable_events(buttonEvents: capnp.lib.capnp._DynamicListBuilder) -> List[int]: +def create_button_enable_events(buttonEvents: capnp.lib.capnp._DynamicListBuilder, pcm_cruise: bool = False) -> List[int]: events = [] for b in buttonEvents: # do enable on both accel and decel buttons - if b.type in (ButtonType.accelCruise, ButtonType.decelCruise) and not b.pressed: - events.append(EventName.buttonEnable) + if not pcm_cruise: + if b.type in (ButtonType.accelCruise, ButtonType.decelCruise) and not b.pressed: + events.append(EventName.buttonEnable) # do disable on button down if b.type == ButtonType.cancel and b.pressed: events.append(EventName.buttonCancel) diff --git a/selfdrive/car/honda/interface.py b/selfdrive/car/honda/interface.py index 5b97b3389f..84437b4f40 100755 --- a/selfdrive/car/honda/interface.py +++ b/selfdrive/car/honda/interface.py @@ -367,7 +367,7 @@ class CarInterface(CarInterfaceBase): events.add(EventName.manualRestart) # handle button presses - events.events.extend(create_button_enable_events(ret.buttonEvents)) + events.events.extend(create_button_enable_events(ret.buttonEvents, self.CP.pcmCruise)) ret.events = events.to_msg()