mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-05 00:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chrysler: resume from cruise standstill (#25009)

Browse Source 
* Chrysler: resume from cruise standstill

* bump panda

* resume isn't set yet
This commit is contained in:
Adeeb Shihadeh
2022-07-07 09:40:04 -07:00
committed by GitHub
parent 7e187426c7
commit ea80ee0845
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panda
+1 -1
Submodule panda updated: fae3ee2e81...53466f0934
selfdrive/car/chrysler/carcontroller.py
+4 -2
View File
@@ -25,9 +25,11 @@ class CarController:
# *** control msgs ***
das_bus = 2 if self.CP.carFingerprint in RAM_CARS else 0
if CC.cruiseControl.cancel:
bus = 2 if self.CP.carFingerprint in RAM_CARS else 0
can_sends.append(create_cruise_buttons(self.packer, CS.button_counter + 1, bus, cancel=True))
can_sends.append(create_cruise_buttons(self.packer, CS.button_counter + 1, das_bus, cancel=True))
elif CC.enabled and CS.out.cruiseState.standstill:
can_sends.append(create_cruise_buttons(self.packer, CS.button_counter + 1, das_bus, resume=True))
# HUD alerts
if self.frame % 25 == 0:
selfdrive/car/chrysler/chryslercan.py
+2 -1
View File
@@ -62,8 +62,9 @@ def create_lkas_command(packer, CP, apply_steer, lat_active, frame):
return packer.make_can_msg("LKAS_COMMAND", 0, values, frame % 0x10)
def create_cruise_buttons(packer, frame, bus, cancel=False):
def create_cruise_buttons(packer, frame, bus, cancel=False, resume=False):
values = {
"ACC_Cancel": cancel,
"ACC_Resume": resume,
}
return packer.make_can_msg("CRUISE_BUTTONS", bus, values, frame % 0x10)