diff --git a/selfdrive/car/car_helpers.py b/selfdrive/car/car_helpers.py index 66097339b182bc..eb41961f62df6f 100644 --- a/selfdrive/car/car_helpers.py +++ b/selfdrive/car/car_helpers.py @@ -21,7 +21,7 @@ def get_startup_event(car_recognized, controller_available, fw_seen): build_metadata = get_build_metadata() - if build_metadata.openpilot.comma_remote and build_metadata.tested_channel: + if (build_metadata.openpilot.comma_remote and build_metadata.tested_channel) or (build_metadata.openpilot.krk_remote and build_metadata.krk_channel): event = EventName.startup else: event = EventName.startupMaster diff --git a/selfdrive/ui/qt/widgets/prime.cc b/selfdrive/ui/qt/widgets/prime.cc index 2621612f67f432..11a43731dc0c02 100644 --- a/selfdrive/ui/qt/widgets/prime.cc +++ b/selfdrive/ui/qt/widgets/prime.cc @@ -138,22 +138,23 @@ PrimeAdWidget::PrimeAdWidget(QWidget* parent) : QFrame(parent) { main_layout->setContentsMargins(80, 90, 80, 60); main_layout->setSpacing(0); + // KRKeegan Remove Prime Ad QLabel *upgrade = new QLabel(tr("Upgrade Now")); upgrade->setStyleSheet("font-size: 75px; font-weight: bold;"); - main_layout->addWidget(upgrade, 0, Qt::AlignTop); - main_layout->addSpacing(50); + //main_layout->addWidget(upgrade, 0, Qt::AlignTop); + //main_layout->addSpacing(50); QLabel *description = new QLabel(tr("Become a comma prime member at connect.comma.ai")); description->setStyleSheet("font-size: 56px; font-weight: light; color: white;"); description->setWordWrap(true); - main_layout->addWidget(description, 0, Qt::AlignTop); + //main_layout->addWidget(description, 0, Qt::AlignTop); - main_layout->addStretch(); + //main_layout->addStretch(); QLabel *features = new QLabel(tr("PRIME FEATURES:")); features->setStyleSheet("font-size: 41px; font-weight: bold; color: #E5E5E5;"); - main_layout->addWidget(features, 0, Qt::AlignBottom); - main_layout->addSpacing(30); + //main_layout->addWidget(features, 0, Qt::AlignBottom); + //main_layout->addSpacing(30); QVector bullets = {tr("Remote access"), tr("24/7 LTE connectivity"), tr("1 year of drive storage"), tr("Turn-by-turn navigation")}; for (auto &b : bullets) { @@ -161,7 +162,7 @@ PrimeAdWidget::PrimeAdWidget(QWidget* parent) : QFrame(parent) { QLabel *l = new QLabel(check + b); l->setAlignment(Qt::AlignLeft); l->setStyleSheet("font-size: 50px; margin-bottom: 15px;"); - main_layout->addWidget(l, 0, Qt::AlignBottom); + //main_layout->addWidget(l, 0, Qt::AlignBottom); } setStyleSheet(R"( diff --git a/system/updated/updated.py b/system/updated/updated.py index d43f439af583c2..034d4b66043ff6 100755 --- a/system/updated/updated.py +++ b/system/updated/updated.py @@ -31,8 +31,8 @@ OVERLAY_INIT = Path(os.path.join(BASEDIR, ".overlay_init")) -DAYS_NO_CONNECTIVITY_MAX = 14 # do not allow to engage after this many days -DAYS_NO_CONNECTIVITY_PROMPT = 10 # send an offroad prompt after this many days +DAYS_NO_CONNECTIVITY_MAX = 36500 # do not allow to engage after this many days // KRKeegan disable connect warning +DAYS_NO_CONNECTIVITY_PROMPT = 36500 # send an offroad prompt after this many days // KRKeegan disable connect warning class UserRequest: NONE = 0 @@ -409,7 +409,9 @@ def fetch_update(self) -> None: def main() -> None: params = Params() - if params.get_bool("DisableUpdates"): + disable = True + + if params.get_bool("DisableUpdates") or disable: # KRKeegan disable updates cloudlog.warning("updates are disabled by the DisableUpdates param") exit(0) diff --git a/system/version.py b/system/version.py index 94964526b3f7a3..90eab652f192e4 100755 --- a/system/version.py +++ b/system/version.py @@ -12,6 +12,7 @@ RELEASE_BRANCHES = ['release3-staging', 'release3', 'nightly'] TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging'] +KRK_BRANCHES = ['Rav4-TSS2'] BUILD_METADATA_FILENAME = "build.json" @@ -80,6 +81,10 @@ def comma_remote(self) -> bool: # touch this to get rid of the orange startup alert. there's better ways to do that return self.git_normalized_origin == "github.com/commaai/openpilot" + @property + def krk_remote(self) -> bool: + return self.git_normalized_origin == "github.com/krkeegan/openpilot" + @property def git_normalized_origin(self) -> str: return self.git_origin \ @@ -98,6 +103,10 @@ class BuildMetadata: def tested_channel(self) -> bool: return self.channel in TESTED_BRANCHES + @property + def krk_channel(self) -> bool: + return self.channel in KRK_BRANCHES + @property def release_channel(self) -> bool: return self.channel in RELEASE_BRANCHES