Merge branch 'master' into disengage-on-gas

pull/23538/head
Jason Wen 3 years ago committed by GitHub
commit 1f591736a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Jenkinsfile
  2. 2
      selfdrive/car/interfaces.py

2
Jenkinsfile vendored

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

@ -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 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 # standard ALC params
ret.steerControlType = car.CarParams.SteerControlType.torque ret.steerControlType = car.CarParams.SteerControlType.torque

Loading…
Cancel
Save