From 746d9fc631775703104cfb33161bbcf4ad111fd6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 5 Feb 2024 01:50:34 -0600 Subject: [PATCH] wip --- selfdrive/controls/lib/events.py | 5 +++-- selfdrive/frogpilot/functions/model_switcher.py | 2 +- selfdrive/modeld/models/supercombo.onnx | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/selfdrive/controls/lib/events.py b/selfdrive/controls/lib/events.py index f516afc..3d195e0 100755 --- a/selfdrive/controls/lib/events.py +++ b/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 diff --git a/selfdrive/frogpilot/functions/model_switcher.py b/selfdrive/frogpilot/functions/model_switcher.py index f7fb8df..b8660dd 100644 --- a/selfdrive/frogpilot/functions/model_switcher.py +++ b/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"); diff --git a/selfdrive/modeld/models/supercombo.onnx b/selfdrive/modeld/models/supercombo.onnx index ca86420..e2897b0 100644 --- a/selfdrive/modeld/models/supercombo.onnx +++ b/selfdrive/modeld/models/supercombo.onnx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae44fe832fe48b89998f09cebb1bcd129864a8f51497b636cd38e66e46d69a89 -size 48457850 +oid sha256:0b7184d46dc2ba3f84eb748252634205105a3742bac29942ae4380b0332fa850 +size 52524758