Resolve conflicts

pull/23538/head
Jason Wen 3 years ago
parent e3be32afc2
commit 1a85afd60c
  1. 2
      selfdrive/car/interfaces.py

@ -74,7 +74,7 @@ class CarInterfaceBase(ABC):
def get_std_params(candidate, fingerprint): def get_std_params(candidate, fingerprint):
ret = car.CarParams.new_message() ret = car.CarParams.new_message()
ret.carFingerprint = candidate ret.carFingerprint = candidate
ret.unsafeMode = 1 ret.unsafeMode = 0
# standard ALC params # standard ALC params
ret.steerControlType = car.CarParams.SteerControlType.torque ret.steerControlType = car.CarParams.SteerControlType.torque

Loading…
Cancel
Save