wip

selfdrive/controls/lib/events.py

@@ -231,7 +231,7 @@ def startup_master_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubM
   if "REPLAY" in os.environ:
     branch = "replay"
 
-  return StartupAlert("Openpilot Ready", "", alert_status=AlertStatus.frogpilot)
+  return StartupAlert("Oscarpilot ready", "Be excellent to eachother", alert_status=AlertStatus.frogpilot)
 
 def below_engage_speed_alert(CP: car.CarParams, CS: car.CarState, sm: messaging.SubMaster, metric: bool, soft_disable_time: int) -> Alert:
   return NoEntryAlert(f"Drive above {get_display_speed(CP.minEnableSpeed, metric)} to engage")
@@ -373,7 +373,8 @@ EVENTS: Dict[int, Dict[str, Union[Alert, AlertCallbackType]]] = {
   },
 
   EventName.startupMaster: {
-    ET.PERMANENT: startup_master_alert,
+    # ET.PERMANENT: startup_master_alert,
+    ET.PERMANENT: StartupAlert("OscarPilot Ready"),
   },
 
   # Car is recognized, but marked as dashcam only

selfdrive/frogpilot/functions/model_switcher.py

@@ -27,7 +27,7 @@ def set_model_list_parameter(params):
 
   if previous_model_list != model_list:
     # Reset the selected model if the model list changed
-    params.put_int("Model", 0)
+    params.put_int("Model", 3)
     params.put("ModelList", model_list)
     params.remove("CalibrationParams");
     params.remove("LiveTorqueParameters");