Skip to content

Commit 6c1fe06

Browse files
committed
rename to resume
1 parent 00b1df6 commit 6c1fe06

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

selfdrive/car/honda/carcontroller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def update(self, CC, CS):
195195
# If using stock ACC, spam cancel command to kill gas when OP disengages.
196196
if pcm_cancel_cmd:
197197
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.CANCEL, idx, self.CP.carFingerprint))
198-
elif CC.cruiseControl.override:
198+
elif CC.cruiseControl.resume:
199199
can_sends.append(hondacan.spam_buttons_command(self.packer, CruiseButtons.RES_ACCEL, idx, self.CP.carFingerprint))
200200

201201
else:

selfdrive/car/hyundai/carcontroller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def update(self, CC, CS):
7878
self.last_button_frame = self.frame
7979

8080
# cruise standstill resume
81-
elif CC.cruiseControl.override:
81+
elif CC.cruiseControl.resume:
8282
can_sends.append(hda2can.create_buttons(self.packer, CS.buttons_counter+1, False, True))
8383
self.last_button_frame = self.frame
8484
else:

selfdrive/car/mazda/carcontroller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def update(self, c, CS, frame):
2828
self.steer_rate_limited = new_steer != apply_steer
2929

3030
if c.enabled:
31-
if c.cruiseControl.override:
31+
if c.cruiseControl.resume:
3232
# Mazda Stop and Go requires a RES button (or gas) press if the car stops more than 3 seconds
3333
# Send Resume button at when planner wants car to move
3434
can_sends.append(mazdacan.create_button_cmd(self.packer, self.CP.carFingerprint, CS.crz_btns_counter, Buttons.RESUME))

selfdrive/car/volkswagen/carcontroller.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def update(self, c, CS, frame, ext_bus, actuators, visual_alert, left_lane_visib
9393
# Cancel ACC if it's engaged with OP disengaged.
9494
self.graButtonStatesToSend = BUTTON_STATES.copy()
9595
self.graButtonStatesToSend["cancel"] = True
96-
elif c.cruiseControl.override:
96+
elif c.cruiseControl.resume:
9797
# Send Resume button when planner wants car to move
9898
self.graButtonStatesToSend = BUTTON_STATES.copy()
9999
self.graButtonStatesToSend["resumeCruise"] = True

selfdrive/controls/controlsd.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ def publish_logs(self, CS, start_time, CC, lac_log):
647647
if self.joystick_mode and self.sm.rcv_frame['testJoystick'] > 0 and self.sm['testJoystick'].buttons[0]:
648648
CC.cruiseControl.cancel = True
649649
if len(speeds := self.sm['longitudinalPlan'].speeds) > 1:
650-
CC.cruiseControl.override = self.enabled and CS.cruiseState.standstill and speeds[-1] > self.CP.vEgoStarting
650+
CC.cruiseControl.resume = self.enabled and CS.cruiseState.standstill and speeds[-1] > self.CP.vEgoStarting
651651

652652
hudControl = CC.hudControl
653653
hudControl.setSpeed = float(self.v_cruise_kph * CV.KPH_TO_MS)

0 commit comments

Comments
 (0)