From e3be32afc2bb2423d29e2b4f85b3cff3fe72aab9 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Fri, 11 Feb 2022 10:51:08 -0500 Subject: [PATCH] Resolve conflicts --- selfdrive/boardd/boardd.cc | 5 ++--- selfdrive/car/interfaces.py | 1 + selfdrive/test/process_replay/process_replay.py | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 09120f1ec6..6ef964270f 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -172,9 +172,8 @@ bool safety_setter_thread(std::vector pandas) { safety_param = 0; } - LOGW("panda %d: setting safety model: %d with param %d", i, (int)safety_model, safety_param); - - panda->set_unsafe_mode(p.getBool("DisengageOnGas") ? 0 : 1); // see safety_declarations.h for allowed values + LOGW("panda %d: setting safety model: %d, param: %d, unsafe mode: %d", i, (int)safety_model, safety_param, unsafe_mode); + panda->set_unsafe_mode(unsafe_mode); panda->set_safety_model(safety_model, safety_param); } diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 261ce2f16e..5303968207 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -74,6 +74,7 @@ class CarInterfaceBase(ABC): def get_std_params(candidate, fingerprint): ret = car.CarParams.new_message() ret.carFingerprint = candidate + ret.unsafeMode = 1 # standard ALC params ret.steerControlType = car.CarParams.SteerControlType.torque diff --git a/selfdrive/test/process_replay/process_replay.py b/selfdrive/test/process_replay/process_replay.py index a16f417b5f..69d79cdcce 100755 --- a/selfdrive/test/process_replay/process_replay.py +++ b/selfdrive/test/process_replay/process_replay.py @@ -346,8 +346,6 @@ def setup_env(): params.clear_all() params.put_bool("OpenpilotEnabledToggle", True) params.put_bool("Passive", False) - params.put_bool("CommunityFeaturesToggle", True) - params.put_bool("DisengageOnGas", True) os.environ['NO_RADAR_SLEEP'] = "1" os.environ["SIMULATION"] = "1"