Resolve conflicts

3 years ago · d273bb78ac
parent 1a85afd60c
commit d273bb78ac
1 changed files with 1 additions and 1 deletions
--- a/selfdrive/car/interfaces.py
+++ b/selfdrive/car/interfaces.py
@ -74,7 +74,7 @@ class CarInterfaceBase(ABC):
  def get_std_params(candidate, fingerprint):
    ret = car.CarParams.new_message()
    ret.carFingerprint = candidate
-    ret.unsafeMode = 0
+    ret.unsafeMode = 0  # see safety_declarations.h for allowed values

    # standard ALC params
    ret.steerControlType = car.CarParams.SteerControlType.torque