Merge branch 'master' into disengage-on-gas

3 years ago · 1f591736a2
parent 465811f0b4 7410160d09
commit 1f591736a2
2 changed files with 1 additions and 3 deletions
--- a/2
+++ b/2
@ -157,7 +157,6 @@ pipeline {
                }
                */

-                /*
                stage('C3: build') {
                  environment {
                    R3_PUSH = "${env.BRANCH_NAME == 'master' ? '1' : ' '}"
@ -172,7 +171,6 @@ pipeline {
                    ])
                  }
                }
-                */

                stage('C3: HW + Unit Tests') {
                  steps {
--- 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 = 1 if Params().get_bool("DisengageOnGas") else 0  # see safety_declarations.h for allowed values
+    ret.unsafeMode = 1 if Params().get_bool("DisengageOnGas") else 0  # see panda/board/safety_declarations.h for allowed values

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