Chrysler: resume from cruise standstill (#25009)

* Chrysler: resume from cruise standstill

* bump panda

* resume isn't set yet
old-commit-hash: ea80ee0845
taco
Adeeb Shihadeh 3 years ago committed by GitHub
parent 5c97a090b6
commit 7143eb7d0a
  1. 2
      panda
  2. 6
      selfdrive/car/chrysler/carcontroller.py
  3. 3
      selfdrive/car/chrysler/chryslercan.py

@ -1 +1 @@
Subproject commit fae3ee2e8161d34a7c1939503e583db9b85e5402
Subproject commit 53466f09344c8ff6cdce3b19df76b5bca79e1327

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

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

Loading…
Cancel
Save