mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Honda: fix enabling before PCM (#24715)

Browse Source 
* Don't enable for pcmCruise Honda

* make it a no entry as well

* do in another PR
old-commit-hash: 40deea7d7bdd2176f897c203657e45bfd7fd1fcc
This commit is contained in:
Shane Smiskol
2022-06-02 22:06:01 -07:00
committed by GitHub
parent 2163c6bf2d
commit 3ba40da00a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
selfdrive/car/__init__.py
View File

@@ -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)

2
selfdrive/car/honda/interface.py
View File

@@ -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()