Skip to content

Commit

Permalink
test tuning #1
Browse files Browse the repository at this point in the history
  • Loading branch information
wocsor committed Sep 26, 2018
1 parent 7dc233c commit 309f59f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions selfdrive/car/toyota/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def get_params(candidate, fingerprint):
ret.safetyModel = car.CarParams.SafetyModels.toyota

# pedal
ret.enableCruise = not ret.enableGasInterceptor
ret.enableCruise = not ret.enableGasInterceptor

# FIXME: hardcoding honda civic 2016 touring params so they can be used to
# scale unknown params for other cars
Expand Down Expand Up @@ -126,7 +126,7 @@ def get_params(candidate, fingerprint):

elif candidate in [CAR.CAMRY, CAR.CAMRYH]:
stop_and_go = True
ret.safetyParam = 100
ret.safetyParam = 100
ret.wheelbase = 2.82448
ret.steerRatio = 13.7
tire_stiffness_factor = 0.7933
Expand Down Expand Up @@ -181,7 +181,7 @@ def get_params(candidate, fingerprint):
ret.steerMaxBP = [16. * CV.KPH_TO_MS, 45. * CV.KPH_TO_MS] # breakpoints at 1 and 40 kph
ret.steerMaxV = [1., 1.] # 2/3rd torque allowed above 45 kph
ret.gasMaxBP = [0.]
ret.gasMaxV = [0.5]
ret.gasMaxV = [0.6] if ret.enableGasInterceptor else [0.5]
ret.brakeMaxBP = [5., 20.]
ret.brakeMaxV = [1., 0.8]

Expand All @@ -195,7 +195,7 @@ def get_params(candidate, fingerprint):

ret.steerLimitAlert = False
ret.stoppingControl = False
ret.startAccel = 0.0
ret.startAccel = 0.5 if ret.enableGasInterceptor else 0.0

ret.longitudinalKpBP = [0., 5., 35.]
ret.longitudinalKpV = [3.6, 2.4, 1.5]
Expand Down Expand Up @@ -255,7 +255,7 @@ def update(self, c):
ret.cruiseState.speed = self.CS.v_cruise_pcm * CV.KPH_TO_MS
ret.cruiseState.available = bool(self.CS.main_on)
ret.cruiseState.speedOffset = 0.

if self.CP.carFingerprint in [CAR.RAV4H, CAR.HIGHLANDERH, CAR.HIGHLANDER] or self.CP.enableGasInterceptor:
# ignore standstill in hybrid vehicles, since pcm allows to restart without
# receiving any special command
Expand Down

0 comments on commit 309f59f

Please sign in to comment.