Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Volt: Don't adjust speed on resume from stopped #325

Merged
merged 4 commits into from
Aug 24, 2018
Merged

Volt: Don't adjust speed on resume from stopped #325

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6fd2563
Merge pull request #4 from commaai/devel
Jamezz Aug 2, 2018
9e50f2f
Merge pull request #5 from commaai/devel
Jamezz Aug 16, 2018
dcbb6ea
Don't adjust speed if resuming
Jamezz Aug 18, 2018
ec4d02c
Detab
Jamezz Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions selfdrive/car/gm/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ def update(self, c):

# cruise state
ret.cruiseState.available = bool(self.CS.main_on)
ret.cruiseState.enabled = self.CS.pcm_acc_status != 0
cruiseEnabled = self.CS.pcm_acc_status != 0
ret.cruiseState.enabled = cruiseEnabled
ret.cruiseState.standstill = self.CS.pcm_acc_status == 4

ret.leftBlinker = self.CS.left_blinker_on
Expand Down Expand Up @@ -228,7 +229,8 @@ def update(self, c):
be.pressed = False
but = self.CS.prev_cruise_buttons
if but == CruiseButtons.RES_ACCEL:
be.type = 'accelCruise'
if not (cruiseEnabled and self.CS.standstill):
be.type = 'accelCruise' # Suppress resume button if we're resuming from stop so we don't adjust speed.
elif but == CruiseButtons.DECEL_SET:
be.type = 'decelCruise'
elif but == CruiseButtons.CANCEL:
Expand Down