From 6c1fe0606fd0a0819ffeaac92526e43b3110f2f4 Mon Sep 17 00:00:00 2001 From: Shane Smiskol Date: Wed, 15 Jun 2022 23:45:26 -0700 Subject: [PATCH] rename to resume --- selfdrive/car/honda/carcontroller.py | 2 +- selfdrive/car/hyundai/carcontroller.py | 2 +- selfdrive/car/mazda/carcontroller.py | 2 +- selfdrive/car/volkswagen/carcontroller.py | 2 +- selfdrive/controls/controlsd.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/selfdrive/car/honda/carcontroller.py b/selfdrive/car/honda/carcontroller.py index 8e0814bd98..dcf7b05a04 100644 --- a/selfdrive/car/honda/carcontroller.py +++ b/selfdrive/car/honda/carcontroller.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: diff --git a/selfdrive/car/hyundai/carcontroller.py b/selfdrive/car/hyundai/carcontroller.py index 2a12664375..e329fd7582 100644 --- a/selfdrive/car/hyundai/carcontroller.py +++ b/selfdrive/car/hyundai/carcontroller.py @@ -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: diff --git a/selfdrive/car/mazda/carcontroller.py b/selfdrive/car/mazda/carcontroller.py index 9280cfaf69..b1e4921b5c 100644 --- a/selfdrive/car/mazda/carcontroller.py +++ b/selfdrive/car/mazda/carcontroller.py @@ -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)) diff --git a/selfdrive/car/volkswagen/carcontroller.py b/selfdrive/car/volkswagen/carcontroller.py index f52469c1de..c7f3eecc86 100644 --- a/selfdrive/car/volkswagen/carcontroller.py +++ b/selfdrive/car/volkswagen/carcontroller.py @@ -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 diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index c8ea20ff10..36e6d4fb6b 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -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)