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

fixed resume press when comma pedal is used
old-commit-hash: 4568504c41
This commit is contained in:
George Hotz
2018-07-13 16:55:40 -07:00
committed by GitHub

View File

@@ -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():