|
|
@ -2,7 +2,7 @@ |
|
|
|
from cereal import car |
|
|
|
from cereal import car |
|
|
|
from common.conversions import Conversions as CV |
|
|
|
from common.conversions import Conversions as CV |
|
|
|
from panda import Panda |
|
|
|
from panda import Panda |
|
|
|
from selfdrive.car.toyota.values import Ecu, CAR, ToyotaFlags, CarControllerParams, TSS2_CAR, RADAR_ACC_CAR, NO_DSU_CAR, \ |
|
|
|
from selfdrive.car.toyota.values import Ecu, CAR, DBC, ToyotaFlags, CarControllerParams, TSS2_CAR, RADAR_ACC_CAR, NO_DSU_CAR, \ |
|
|
|
MIN_ACC_SPEED, EPS_SCALE, EV_HYBRID_CAR, UNSUPPORTED_DSU_CAR, NO_STOP_TIMER_CAR, ANGLE_CONTROL_CAR |
|
|
|
MIN_ACC_SPEED, EPS_SCALE, EV_HYBRID_CAR, UNSUPPORTED_DSU_CAR, NO_STOP_TIMER_CAR, ANGLE_CONTROL_CAR |
|
|
|
from selfdrive.car import STD_CARGO_KG, scale_tire_stiffness, get_safety_config |
|
|
|
from selfdrive.car import STD_CARGO_KG, scale_tire_stiffness, get_safety_config |
|
|
|
from selfdrive.car.interfaces import CarInterfaceBase |
|
|
|
from selfdrive.car.interfaces import CarInterfaceBase |
|
|
@ -21,7 +21,8 @@ class CarInterface(CarInterfaceBase): |
|
|
|
ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.toyota)] |
|
|
|
ret.safetyConfigs = [get_safety_config(car.CarParams.SafetyModel.toyota)] |
|
|
|
ret.safetyConfigs[0].safetyParam = EPS_SCALE[candidate] |
|
|
|
ret.safetyConfigs[0].safetyParam = EPS_SCALE[candidate] |
|
|
|
|
|
|
|
|
|
|
|
if candidate in (CAR.RAV4, CAR.PRIUS_V, CAR.COROLLA, CAR.LEXUS_ESH, CAR.LEXUS_CTH): |
|
|
|
# BRAKE_MODULE is on a different address for these cars |
|
|
|
|
|
|
|
if DBC[candidate]["pt"] == "toyota_new_mc_pt_generated": |
|
|
|
ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_ALT_BRAKE |
|
|
|
ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_ALT_BRAKE |
|
|
|
|
|
|
|
|
|
|
|
if candidate in ANGLE_CONTROL_CAR: |
|
|
|
if candidate in ANGLE_CONTROL_CAR: |
|
|
|