diff --git a/starpilot/controls/lib/starpilot_acceleration.py b/starpilot/controls/lib/starpilot_acceleration.py index c32612874c..041e9d7390 100644 --- a/starpilot/controls/lib/starpilot_acceleration.py +++ b/starpilot/controls/lib/starpilot_acceleration.py @@ -1,8 +1,7 @@ #!/usr/bin/env python3 import numpy as np -from opendbc.car.interfaces import ACCEL_MIN -from openpilot.selfdrive.controls.lib.longitudinal_planner import get_max_accel +from openpilot.selfdrive.controls.lib.longitudinal_planner import A_CRUISE_MIN, get_max_accel from openpilot.starpilot.common.starpilot_variables import CITY_SPEED_LIMIT @@ -43,8 +42,8 @@ def akima_interp(x, xp, fp): return (fp[i]*(1 - 10*t3 + 15*t4 - 6*t3*t2) + fp[i+1]*(10*t3 - 15*t4 + 6*t3*t2)) -A_CRUISE_MIN_ECO = ACCEL_MIN / 2 -A_CRUISE_MIN_SPORT = ACCEL_MIN * 2 +A_CRUISE_MIN_ECO = A_CRUISE_MIN / 2 +A_CRUISE_MIN_SPORT = A_CRUISE_MIN * 2 # MPH = [0.0, 11, 22, 34, 45, 56, 89] A_CRUISE_MAX_BP_CUSTOM = [0.0, 5., 10., 15., 20., 25., 40.] @@ -163,4 +162,4 @@ class StarPilotAcceleration: elif starpilot_toggles.deceleration_profile == DECELERATION_PROFILES["SPORT"]: self.min_accel = A_CRUISE_MIN_SPORT else: - self.min_accel = ACCEL_MIN + self.min_accel = A_CRUISE_MIN