Merge pull request commaai#290 from commaai/pedal-resum-speed-fix

fixed resume press when comma pedal is used
dragonpilot-community · Jul 13, 2018 · 734002e · 734002e
2 parents 0d9447c + 949cbd2
commit 734002e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/selfdrive/controls/lib/drive_helpers.py b/selfdrive/controls/lib/drive_helpers.py
@@ -92,11 +92,11 @@ def update_v_cruise(v_cruise_kph, buttonEvents, enabled):
 
 def initialize_v_cruise(v_ego, buttonEvents, v_cruise_last):
   for b in buttonEvents:
-    # 300kph or above probably means we never had a set speed
-    if b.type == "accelCruise" and v_cruise_last < 300:
+    # 250kph or above probably means we never had a set speed
+    if b.type == "accelCruise" and v_cruise_last < 250:
       return v_cruise_last
 
-  return int(round(max(v_ego * CV.MS_TO_KPH, V_CRUISE_ENABLE_MIN)))
+  return int(round(clip(v_ego * CV.MS_TO_KPH, V_CRUISE_ENABLE_MIN, V_CRUISE_MAX)))
 
 
 def kill_defaultd():