diff --git a/openpilot/cereal/log.capnp b/openpilot/cereal/log.capnp index c7a08ee105..a74bea68b5 100644 --- a/openpilot/cereal/log.capnp +++ b/openpilot/cereal/log.capnp @@ -129,7 +129,6 @@ struct OnroadEvent @0xc4fa6047f024e718 { userBookmark @95; excessiveActuation @96; bigModelLoading @100; - bigModelReady @101; bigModelFailed @102; lowBatteryDEPRECATED @40; @@ -137,6 +136,7 @@ struct OnroadEvent @0xc4fa6047f024e718 { deviceFallingDEPRECATED @71; usbErrorDEPRECATED @78; audioFeedbackDEPRECATED @97; + bigModelReadyDEPRECATED @101; } } diff --git a/openpilot/selfdrive/assets/sounds/complete.wav b/openpilot/selfdrive/assets/sounds/complete.wav deleted file mode 100644 index f85d48f315..0000000000 --- a/openpilot/selfdrive/assets/sounds/complete.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3027da9834adf9c71177bc3086f8de3018ce22e4725b694d635723c5b3c860cd -size 97120 diff --git a/openpilot/selfdrive/selfdrived/events.py b/openpilot/selfdrive/selfdrived/events.py index 47babec414..ddd8ec330b 100755 --- a/openpilot/selfdrive/selfdrived/events.py +++ b/openpilot/selfdrive/selfdrived/events.py @@ -414,10 +414,6 @@ EVENTS: dict[int, dict[str, Alert | AlertCallbackType]] = { ET.PERMANENT: NormalPermanentAlert("Big Model Loading"), }, - EventName.bigModelReady: { - ET.PERMANENT: EngagementAlert(AudibleAlert.complete), - }, - EventName.bigModelFailed: { ET.PERMANENT: NormalPermanentAlert("Big Model Failed ", "Restart the car to retry,\nnow driving on small model", duration=30.), }, diff --git a/openpilot/selfdrive/selfdrived/selfdrived.py b/openpilot/selfdrive/selfdrived/selfdrived.py index 9507fcfbd1..f4e5a5ba2e 100755 --- a/openpilot/selfdrive/selfdrived/selfdrived.py +++ b/openpilot/selfdrive/selfdrived/selfdrived.py @@ -160,9 +160,7 @@ class SelfdriveD: loading = self.params.get_bool("UsbGpuLoading") if self.big_model_loading and not loading: self.big_model_ready_t = time.monotonic() - if self.params.get_bool("UsbGpuActive"): - self.events.add(EventName.bigModelReady) - else: + if not self.params.get_bool("UsbGpuActive"): self.events.add(EventName.bigModelFailed) self.big_model_loading = loading if self.big_model_loading: diff --git a/openpilot/selfdrive/ui/soundd.py b/openpilot/selfdrive/ui/soundd.py index b87585a041..a740f02c5d 100644 --- a/openpilot/selfdrive/ui/soundd.py +++ b/openpilot/selfdrive/ui/soundd.py @@ -44,7 +44,6 @@ sound_list: dict[int, tuple[str, int | None, float]] = { AudibleAlert.promptDistracted: ("dm_warning.wav", None, MAX_VOLUME), AudibleAlert.preAlert: ("pre_alert.wav", 1, MAX_VOLUME), - AudibleAlert.complete: ("complete.wav", 1, MAX_VOLUME), AudibleAlert.warningSoft: ("critical.wav", None, MAX_VOLUME), AudibleAlert.warningImmediate: ("dm_critical.wav", None, MAX_VOLUME),