rename to resume

pull/24873/head
Shane Smiskol 3 years ago
parent 00b1df652f
commit 6c1fe0606f
  1. 2
      selfdrive/car/honda/carcontroller.py
  2. 2
      selfdrive/car/hyundai/carcontroller.py
  3. 2
      selfdrive/car/mazda/carcontroller.py
  4. 2
      selfdrive/car/volkswagen/carcontroller.py
  5. 2
      selfdrive/controls/controlsd.py

@ -195,7 +195,7 @@ class CarController:
# If using stock ACC, spam cancel command to kill gas when OP disengages.
if pcm_cancel_cmd:
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.CANCEL, idx, self.CP.carFingerprint))
elif CC.cruiseControl.override:
elif CC.cruiseControl.resume:
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, self.CP.carFingerprint))
else:

@ -78,7 +78,7 @@ class CarController:
self.last_button_frame = self.frame
# cruise standstill resume
elif CC.cruiseControl.override:
elif CC.cruiseControl.resume:
can_sends.append(hda2can.create_buttons(self.packer, CS.buttons_counter+1, False, True))
self.last_button_frame = self.frame
else:

@ -28,7 +28,7 @@ class CarController():
self.steer_rate_limited = new_steer != apply_steer
if c.enabled:
if c.cruiseControl.override:
if c.cruiseControl.resume:
# Mazda Stop and Go requires a RES button (or gas) press if the car stops more than 3 seconds
# Send Resume button at when planner wants car to move
can_sends.append(mazdacan.create_button_cmd(self.packer, self.CP.carFingerprint, CS.crz_btns_counter, Buttons.RESUME))

@ -93,7 +93,7 @@ class CarController():
# Cancel ACC if it's engaged with OP disengaged.
self.graButtonStatesToSend = BUTTON_STATES.copy()
self.graButtonStatesToSend["cancel"] = True
elif c.cruiseControl.override:
elif c.cruiseControl.resume:
# Send Resume button when planner wants car to move
self.graButtonStatesToSend = BUTTON_STATES.copy()
self.graButtonStatesToSend["resumeCruise"] = True

@ -647,7 +647,7 @@ class Controls:
if self.joystick_mode and self.sm.rcv_frame['testJoystick'] > 0 and self.sm['testJoystick'].buttons[0]:
CC.cruiseControl.cancel = True
if len(speeds := self.sm['longitudinalPlan'].speeds) > 1:
CC.cruiseControl.override = self.enabled and CS.cruiseState.standstill and speeds[-1] > self.CP.vEgoStarting
CC.cruiseControl.resume = self.enabled and CS.cruiseState.standstill and speeds[-1] > self.CP.vEgoStarting
hudControl = CC.hudControl
hudControl.setSpeed = float(self.v_cruise_kph * CV.KPH_TO_MS)

Loading…
Cancel
Save