Resolve conflicts

selfdrive/boardd/boardd.cc

@@ -172,9 +172,8 @@ bool safety_setter_thread(std::vector<Panda *> pandas) {
       safety_param = 0;
     }
 
-    LOGW("panda %d: setting safety model: %d with param %d", i, (int)safety_model, safety_param);
+    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_unsafe_mode(p.getBool("DisengageOnGas") ? 0 : 1);  // see safety_declarations.h for allowed values
     panda->set_safety_model(safety_model, safety_param);
   }
 

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

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"