Skip to content

Commit ea80ee0

Browse files
Chrysler: resume from cruise standstill (#25009)
* Chrysler: resume from cruise standstill * bump panda * resume isn't set yet
1 parent 7e18742 commit ea80ee0

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

selfdrive/car/chrysler/carcontroller.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ def update(self, CC, CS, low_speed_alert):
2525

2626
# *** control msgs ***
2727

28+
das_bus = 2 if self.CP.carFingerprint in RAM_CARS else 0
2829
if CC.cruiseControl.cancel:
29-
bus = 2 if self.CP.carFingerprint in RAM_CARS else 0
30-
can_sends.append(create_cruise_buttons(self.packer, CS.button_counter + 1, bus, cancel=True))
30+
can_sends.append(create_cruise_buttons(self.packer, CS.button_counter + 1, das_bus, cancel=True))
31+
elif CC.enabled and CS.out.cruiseState.standstill:
32+
can_sends.append(create_cruise_buttons(self.packer, CS.button_counter + 1, das_bus, resume=True))
3133

3234
# HUD alerts
3335
if self.frame % 25 == 0:

selfdrive/car/chrysler/chryslercan.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ def create_lkas_command(packer, CP, apply_steer, lat_active, frame):
6262
return packer.make_can_msg("LKAS_COMMAND", 0, values, frame % 0x10)
6363

6464

65-
def create_cruise_buttons(packer, frame, bus, cancel=False):
65+
def create_cruise_buttons(packer, frame, bus, cancel=False, resume=False):
6666
values = {
6767
"ACC_Cancel": cancel,
68+
"ACC_Resume": resume,
6869
}
6970
return packer.make_can_msg("CRUISE_BUTTONS", bus, values, frame % 0x10)

0 commit comments

Comments
 (0)