Merge remote-tracking branch 'upstream/master' into card

selfdrive/car/card.py

@@ -53,12 +53,11 @@ class Car:
     if not disengage_on_accelerator:
       self.CP.alternativeExperience |= ALTERNATIVE_EXPERIENCE.DISABLE_DISENGAGE_ON_GAS
 
-    car_recognized = self.CP.carName != 'mock'
     openpilot_enabled_toggle = self.params.get_bool("OpenpilotEnabledToggle")
 
     controller_available = self.CI.CC is not None and openpilot_enabled_toggle and not self.CP.dashcamOnly
 
-    self.CP.passive = not car_recognized or not controller_available or self.CP.dashcamOnly
+    self.CP.passive = not controller_available or self.CP.dashcamOnly
     if self.CP.passive:
       safety_config = car.CarParams.SafetyConfig.new_message()
       safety_config.safetyModel = car.CarParams.SafetyModel.noOutput

selfdrive/car/mock/interface.py

@@ -18,6 +18,7 @@ class CarInterface(CarInterfaceBase):
     ret.wheelbase = 2.70
     ret.centerToFront = ret.wheelbase * 0.5
     ret.steerRatio = 13.
+    ret.dashcamOnly = True
     return ret
 
   def _update(self, c):