Toyota: Fix upstream merge conflicts

This commit is contained in:
Jason Wen
2024-03-07 15:31:46 -05:00
parent 95c748b9f9
commit 7bfd2b81e1
+3
View File
@@ -269,6 +269,9 @@ class CarInterface(CarInterfaceBase):
if ret.enableGasInterceptor:
ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_GAS_INTERCEPTOR
if candidate in UNSUPPORTED_DSU_CAR:
ret.safetyConfigs[0].safetyParam |= Panda.FLAG_TOYOTA_UNSUPPORTED_DSU_CAR
# min speed to enable ACC. if car can do stop and go, then set enabling speed
# to a negative value, so it won't matter.
ret.minEnableSpeed = -1. if (stop_and_go or ret.enableGasInterceptor) else MIN_ACC_SPEED