From bcf5b06c822fd1bce1de5f119e42cb763d8e282f Mon Sep 17 00:00:00 2001 From: discountchubbs Date: Thu, 17 Jul 2025 14:14:29 -0700 Subject: [PATCH] Init Developer panel SP --- common/params_keys.h | 4 +-- .../qt/offroad/settings/developer_panel.cc | 29 +------------------ .../qt/offroad/settings/developer_panel.h | 2 -- system/manager/manager.py | 4 +-- system/version.py | 6 +--- 5 files changed, 4 insertions(+), 41 deletions(-) diff --git a/common/params_keys.h b/common/params_keys.h index 1641feb911..e7c4e11745 100644 --- a/common/params_keys.h +++ b/common/params_keys.h @@ -127,7 +127,6 @@ inline static std::unordered_map keys = { {"AutoLaneChangeTimer", PERSISTENT}, {"BlinkerMinLateralControlSpeed", PERSISTENT | BACKUP}, {"BlinkerPauseLateralControl", PERSISTENT | BACKUP}, - {"Brightness", PERSISTENT | BACKUP}, {"CarParamsSP", CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION}, {"CarParamsSPCache", CLEAR_ON_MANAGER_START}, {"CarParamsSPPersistent", PERSISTENT}, @@ -138,11 +137,10 @@ inline static std::unordered_map keys = { {"DeviceBootMode", PERSISTENT | BACKUP}, {"EnableGithubRunner", PERSISTENT | BACKUP}, {"InteractivityTimeout", PERSISTENT | BACKUP}, - {"IsDevelopmentBranch", CLEAR_ON_MANAGER_START}, {"MaxTimeOffroad", PERSISTENT | BACKUP}, + {"Brightness", PERSISTENT | BACKUP}, {"ModelRunnerTypeCache", CLEAR_ON_ONROAD_TRANSITION}, {"OffroadMode", CLEAR_ON_MANAGER_START}, - {"QuickBootToggle", PERSISTENT | BACKUP}, {"QuietMode", PERSISTENT | BACKUP}, // MADS params diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc b/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc index 39af66223e..7b4a705251 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.cc @@ -11,17 +11,6 @@ DeveloperPanelSP::DeveloperPanelSP(SettingsWindow *parent) : DeveloperPanel(pare enableGithubRunner = new ParamControlSP("EnableGithubRunner", tr("Enable GitHub runner service"), tr("Enables or disables the github runner service."), ""); addItem(enableGithubRunner); - // Quickboot Mode Toggle - prebuiltToggle = new ParamControlSP("QuickBootToggle", tr("Enable Quickboot Mode"), tr(""), ""); - addItem(prebuiltToggle); - - QObject::connect(prebuiltToggle, &ParamControl::toggleFlipped, [=](bool state) { - QString prebuiltPath = "/data/openpilot/prebuilt"; - state ? QFile(prebuiltPath).open(QIODevice::WriteOnly) : QFile::remove(prebuiltPath); - prebuiltToggle->refresh(); - }); - prebuiltToggle->setVisible(false); - // Error log button errorLogBtn = new ButtonControlSP(tr("Error Log"), tr("VIEW"), tr("View the error log for sunnypilot crashes.")); connect(errorLogBtn, &ButtonControlSP::clicked, [=]() { @@ -35,28 +24,12 @@ DeveloperPanelSP::DeveloperPanelSP(SettingsWindow *parent) : DeveloperPanel(pare void DeveloperPanelSP::updateToggles(bool offroad) { bool is_release = params.getBool("IsReleaseBranch"); - bool is_tested = params.getBool("IsTestedBranch"); - bool is_development = params.getBool("IsDevelopmentBranch"); - bool disable_updates = params.getBool("DisableUpdates"); - - prebuiltToggle->setVisible(!is_release && !is_tested && !is_development); - prebuiltToggle->setEnabled(offroad && disable_updates); - - params.putBool("QuickBootToggle", QFile::exists("/data/openpilot/prebuilt")); - prebuiltToggle->refresh(); - - prebuiltToggle->setDescription(disable_updates - ? tr("When toggled on, this creates a prebuilt file to allow accelerated boot times. When toggled off, " - "it immediately removes the prebuilt file so compilation of locally edited cpp files can be made. " - "

To edit C++ files locally on device, you MUST first turn off this toggle so the changes can recompile.") - : tr("Quickboot mode requires updates to be disabled.
Enable 'Disable Updates' in the Software panel first.")); enableGithubRunner->setVisible(!is_release); - errorLogBtn->setVisible(!is_release && !is_tested); + errorLogBtn->setVisible(!is_release); } void DeveloperPanelSP::showEvent(QShowEvent *event) { DeveloperPanel::showEvent(event); updateToggles(!uiState()->scene.started); - prebuiltToggle->showDescription(); } diff --git a/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.h b/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.h index dfc7bbb3f1..d99e2bd271 100644 --- a/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.h +++ b/selfdrive/ui/sunnypilot/qt/offroad/settings/developer_panel.h @@ -5,7 +5,6 @@ * See the LICENSE.md file in the root directory for more details. */ #pragma once -#include #include "selfdrive/ui/qt/offroad/developer_panel.h" @@ -17,7 +16,6 @@ public: private: ParamControlSP *enableGithubRunner; ButtonControlSP *errorLogBtn; - ParamControlSP *prebuiltToggle; Params params; private slots: diff --git a/system/manager/manager.py b/system/manager/manager.py index 8afd8fe2c7..b68207b691 100755 --- a/system/manager/manager.py +++ b/system/manager/manager.py @@ -50,7 +50,6 @@ def manager_init() -> None: ("BlindSpot", "0"), ("BlinkerMinLateralControlSpeed", "20"), # MPH or km/h ("BlinkerPauseLateralControl", "0"), - ("Brightness", "0"), ("CustomAccIncrementsEnabled", "0"), ("CustomAccLongPressIncrement", "5"), ("CustomAccShortPressIncrement", "1"), @@ -66,10 +65,10 @@ def manager_init() -> None: ("MadsUnifiedEngagementMode", "1"), ("MapdVersion", f"{VERSION}"), ("MaxTimeOffroad", "1800"), + ("Brightness", "0"), ("ModelManager_LastSyncTime", "0"), ("ModelManager_ModelsCache", ""), ("NeuralNetworkLateralControl", "0"), - ("QuickBootToggle", "0"), ("QuietMode", "0"), ] @@ -102,7 +101,6 @@ def manager_init() -> None: params.put("GitCommitDate", build_metadata.openpilot.git_commit_date) params.put("GitBranch", build_metadata.channel) params.put("GitRemote", build_metadata.openpilot.git_origin) - params.put_bool("IsDevelopmentBranch", build_metadata.development_channel) params.put_bool("IsTestedBranch", build_metadata.tested_channel) params.put_bool("IsReleaseBranch", build_metadata.release_channel) params.put("HardwareSerial", serial) diff --git a/system/version.py b/system/version.py index 6e4d0fb42d..11c6ced2b7 100755 --- a/system/version.py +++ b/system/version.py @@ -117,13 +117,9 @@ class BuildMetadata: def master_channel(self) -> bool: return self.channel in MASTER_SP_BRANCHES - @property - def development_channel(self) -> bool: - return self.channel.startswith("dev-") or self.channel.endswith("-prebuilt") - @property def channel_type(self) -> str: - if self.development_channel: + if self.channel.startswith("dev-"): return "development" elif self.channel.startswith("staging-"): return "staging"