sadmen
/
jyoung
mirror of https://github.com/jyoung8607/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix cruise button mph increment (#22487)

Browse Source
x-andyml
Willem Melching 4 years ago committed by GitHub
parent d898841e87
commit 5587964d58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      selfdrive/controls/lib/drive_helpers.py

5
selfdrive/controls/lib/drive_helpers.py
Unescape View File

@ -60,8 +60,7 @@ def update_v_cruise(v_cruise_kph, buttonEvents, button_timers, enabled, metric):
long_press = False long_press = False
button_type = None button_type = None
v_cruise_delta = 1 if metric else CV.MPH_TO_KPH v_cruise_delta = 1 if metric else 1.6
fast_cruise_multiplier = 10 if metric else 5
for b in buttonEvents: for b in buttonEvents:
if b.type.raw in button_timers and not b.pressed: if b.type.raw in button_timers and not b.pressed:
@ -77,7 +76,7 @@ def update_v_cruise(v_cruise_kph, buttonEvents, button_timers, enabled, metric):
break break
if button_type: if button_type:
v_cruise_delta = v_cruise_delta * (fast_cruise_multiplier if long_press else 1) v_cruise_delta = v_cruise_delta * (5 if long_press else 1)
if long_press and v_cruise_kph % v_cruise_delta != 0: # partial interval if long_press and v_cruise_kph % v_cruise_delta != 0: # partial interval
v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](v_cruise_kph / v_cruise_delta) * v_cruise_delta v_cruise_kph = CRUISE_NEAREST_FUNC[button_type](v_cruise_kph / v_cruise_delta) * v_cruise_delta
else: else:

Write Preview
Loading…
Cancel
Save