diff --git a/dragonpilot/selfdrive/assets/dragonpilot.png b/dragonpilot/selfdrive/assets/dragonpilot.png new file mode 100644 index 000000000..aa90a78c4 Binary files /dev/null and b/dragonpilot/selfdrive/assets/dragonpilot.png differ diff --git a/dragonpilot/selfdrive/assets/icons/icon_empty.svg b/dragonpilot/selfdrive/assets/icons/icon_empty.svg new file mode 100644 index 000000000..2f73de52a --- /dev/null +++ b/dragonpilot/selfdrive/assets/icons/icon_empty.svg @@ -0,0 +1,35 @@ + + + + + diff --git a/dragonpilot/selfdrive/assets/images/spinner_comma.png b/dragonpilot/selfdrive/assets/images/spinner_comma.png new file mode 100644 index 000000000..aa90a78c4 Binary files /dev/null and b/dragonpilot/selfdrive/assets/images/spinner_comma.png differ diff --git a/selfdrive/selfdrived/selfdrived.py b/selfdrive/selfdrived/selfdrived.py index 8529dff4e..3065f6b80 100755 --- a/selfdrive/selfdrived/selfdrived.py +++ b/selfdrive/selfdrived/selfdrived.py @@ -122,7 +122,7 @@ class SelfdriveD: self.ignored_processes = {'loggerd', } # Determine startup event - self.startup_event = EventName.startup if build_metadata.openpilot.comma_remote and build_metadata.tested_channel else EventName.startupMaster + self.startup_event = EventName.startup #if build_metadata.openpilot.comma_remote and build_metadata.tested_channel else EventName.startupMaster if not car_recognized: self.startup_event = EventName.startupNoCar elif car_recognized and self.CP.passive: diff --git a/selfdrive/ui/qt/onroad/buttons.cc b/selfdrive/ui/qt/onroad/buttons.cc index 32e58c9db..b4f9c68b1 100644 --- a/selfdrive/ui/qt/onroad/buttons.cc +++ b/selfdrive/ui/qt/onroad/buttons.cc @@ -19,7 +19,7 @@ void drawIcon(QPainter &p, const QPoint ¢er, const QPixmap &img, const QBrus ExperimentalButton::ExperimentalButton(QWidget *parent) : experimental_mode(false), engageable(false), QPushButton(parent) { setFixedSize(btn_size, btn_size); - engage_img = loadPixmap("../assets/icons/chffr_wheel.png", {img_size, img_size}); + engage_img = loadPixmap("../../dragonpilot/selfdrive/assets/dragonpilot.png", {img_size, img_size}); experimental_img = loadPixmap("../assets/icons/experimental.svg", {img_size, img_size}); QObject::connect(this, &QPushButton::clicked, this, &ExperimentalButton::changeMode); } diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index 966396edc..47bedf44a 100644 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -25,7 +25,7 @@ void Sidebar::drawMetric(QPainter &p, const QPair &label, QCol } Sidebar::Sidebar(QWidget *parent) : QFrame(parent), onroad(false), flag_pressed(false), settings_pressed(false) { - home_img = loadPixmap("../assets/images/button_home.png", home_btn.size()); + home_img = loadPixmap("../../dragonpilot/selfdrive/assets/dragonpilot.png", home_btn.size()); flag_img = loadPixmap("../assets/images/button_flag.png", home_btn.size()); settings_img = loadPixmap("../assets/images/button_settings.png", settings_btn.size(), Qt::IgnoreAspectRatio); diff --git a/selfdrive/ui/qt/util.cc b/selfdrive/ui/qt/util.cc index ff381fe39..bcdb72bbe 100644 --- a/selfdrive/ui/qt/util.cc +++ b/selfdrive/ui/qt/util.cc @@ -26,11 +26,11 @@ QString getVersion() { } QString getBrand() { - return QObject::tr("openpilot"); + return QObject::tr("dragonpilot"); } QString getUserAgent() { - return "openpilot-" + getVersion(); + return "dragonpilot-" + getVersion(); } std::optional getDongleId() { diff --git a/system/sentry.py b/system/sentry.py index 63bf789b6..5733b5377 100644 --- a/system/sentry.py +++ b/system/sentry.py @@ -12,9 +12,9 @@ from openpilot.system.version import get_build_metadata, get_version class SentryProject(Enum): # python project - SELFDRIVE = "https://6f3c7076c1e14b2aa10f5dde6dda0cc4@o33823.ingest.sentry.io/77924" + SELFDRIVE = "https://980a0cba712a4c3593c33c78a12446e1@o273754.ingest.sentry.io/1488600" # native project - SELFDRIVE_NATIVE = "https://3e4b586ed21a4479ad5d85083b639bc6@o33823.ingest.sentry.io/157615" + SELFDRIVE_NATIVE = "https://980a0cba712a4c3593c33c78a12446e1@o273754.ingest.sentry.io/1488600" def report_tombstone(fn: str, message: str, contents: str) -> None: diff --git a/system/ui/spinner.py b/system/ui/spinner.py index 2af24c4e5..be847e4b7 100755 --- a/system/ui/spinner.py +++ b/system/ui/spinner.py @@ -24,7 +24,7 @@ def clamp(value, min_value, max_value): class SpinnerRenderer: def __init__(self): - self._comma_texture = gui_app.texture("images/spinner_comma.png", TEXTURE_SIZE, TEXTURE_SIZE) + self._comma_texture = gui_app.texture("../../dragonpilot/selfdrive/assets/images/spinner_comma.png", TEXTURE_SIZE, TEXTURE_SIZE) self._spinner_texture = gui_app.texture("images/spinner_track.png", TEXTURE_SIZE, TEXTURE_SIZE, alpha_premultiply=True) self._rotation = 0.0 self._progress: int | None = None