|
|
|
@ -5,10 +5,9 @@ from panda import Panda |
|
|
|
|
from common.numpy_fast import clip, interp |
|
|
|
|
from common.params import Params |
|
|
|
|
from selfdrive.config import Conversions as CV |
|
|
|
|
from selfdrive.car.honda.values import CruiseButtons, CAR, HONDA_BOSCH, HONDA_BOSCH_ALT_BRAKE_SIGNAL |
|
|
|
|
from selfdrive.car.honda.values import CarControllerParams, CruiseButtons, CAR, HONDA_BOSCH, HONDA_BOSCH_ALT_BRAKE_SIGNAL |
|
|
|
|
from selfdrive.car.honda.hondacan import disable_radar |
|
|
|
|
from selfdrive.car import STD_CARGO_KG, CivicParams, scale_rot_inertia, scale_tire_stiffness, gen_empty_fingerprint |
|
|
|
|
from selfdrive.controls.lib.longitudinal_planner import A_CRUISE_MAX_VALS |
|
|
|
|
from selfdrive.car.interfaces import CarInterfaceBase |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -120,7 +119,7 @@ class CarInterface(CarInterfaceBase): |
|
|
|
|
# accelOverride is more or less the max throttle allowed to pcm: usually set to a constant |
|
|
|
|
# unless aTargetMax is very high and then we scale with it; this help in quicker restart |
|
|
|
|
|
|
|
|
|
return float(max(max_accel, a_target / A_CRUISE_MAX_VALS[0])) * min(speedLimiter, accelLimiter) |
|
|
|
|
return float(max(max_accel, a_target / CarControllerParams.ACCEL_MAX)) * min(speedLimiter, accelLimiter) |
|
|
|
|
|
|
|
|
|
@staticmethod |
|
|
|
|
def get_params(candidate, fingerprint=gen_empty_fingerprint(), car_fw=[]): # pylint: disable=dangerous-default-value |
|
|
|
|