diff --git a/selfdrive/controls/lib/longitudinal_planner.py b/selfdrive/controls/lib/longitudinal_planner.py index 6880f56..1541f3c 100644 --- a/selfdrive/controls/lib/longitudinal_planner.py +++ b/selfdrive/controls/lib/longitudinal_planner.py @@ -143,7 +143,7 @@ class LongitudinalPlanner: self.radarless_model = self.params.get("Model", encoding='utf-8') in RADARLESS_MODELS - self.release = get_short_branch() == "FrogPilot" + self.release = get_short_branch() == "clearpilot" self.update_frogpilot_params() diff --git a/selfdrive/frogpilot/controls/frogpilot_planner.py b/selfdrive/frogpilot/controls/frogpilot_planner.py index 3b0901f..2b4fe31 100644 --- a/selfdrive/frogpilot/controls/frogpilot_planner.py +++ b/selfdrive/frogpilot/controls/frogpilot_planner.py @@ -62,7 +62,7 @@ class FrogPilotPlanner: self.lead_one = Lead() self.mtsc = MapTurnSpeedController() - self.release = get_short_branch() == "FrogPilot" + self.release = get_short_branch() == "clearpilot" self.radarless_model = self.params.get("Model", encoding='utf-8') in RADARLESS_MODELS diff --git a/selfdrive/frogpilot/controls/lib/model_manager.py b/selfdrive/frogpilot/controls/lib/model_manager.py index 90a7059..9664137 100644 --- a/selfdrive/frogpilot/controls/lib/model_manager.py +++ b/selfdrive/frogpilot/controls/lib/model_manager.py @@ -6,8 +6,8 @@ import urllib.request from openpilot.common.params import Params from openpilot.system.version import get_short_branch -VERSION = 'v1' if get_short_branch() == "FrogPilot" else 'v2' -REPOSITORY_URL = 'https://github.com/FrogAi/FrogPilot-Resources/releases/download' +VERSION = 'v1' if get_short_branch() == "clearpilot" else 'v2' +REPOSITORY_URL = 'https://privategit.hanson.xyz/brianhansonxyz/clearpilot' DEFAULT_MODEL = "wd-40" DEFAULT_MODEL_NAME = "WD40 (Default)" diff --git a/selfdrive/frogpilot/ui/qt/offroad/control_settings.cc b/selfdrive/frogpilot/ui/qt/offroad/control_settings.cc index 416aa18..4080f90 100644 --- a/selfdrive/frogpilot/ui/qt/offroad/control_settings.cc +++ b/selfdrive/frogpilot/ui/qt/offroad/control_settings.cc @@ -44,7 +44,7 @@ bool checkNNFFLogFileExists(const std::string &carFingerprint) { FrogPilotControlsPanel::FrogPilotControlsPanel(SettingsWindow *parent) : FrogPilotListWidget(parent) { std::string branch = params.get("GitBranch"); - isRelease = branch == "FrogPilot"; + isRelease = branch == "clearpilot"; const std::vector> controlToggles { {"Tuning", tr("Tuning"), tr(""), "../assets/offroad/icon_settings.png"}, diff --git a/selfdrive/frogpilot/ui/qt/offroad/visual_settings.cc b/selfdrive/frogpilot/ui/qt/offroad/visual_settings.cc index d9199fd..6e02745 100644 --- a/selfdrive/frogpilot/ui/qt/offroad/visual_settings.cc +++ b/selfdrive/frogpilot/ui/qt/offroad/visual_settings.cc @@ -2,7 +2,8 @@ FrogPilotVisualsPanel::FrogPilotVisualsPanel(SettingsWindow *parent) : FrogPilotListWidget(parent) { std::string branch = params.get("GitBranch"); - isRelease = branch == "FrogPilot"; + // CLEARPILOT + isRelease = branch == "clearpilot"; const std::vector> visualToggles { {"AlertVolumeControl", tr("Alert Volume Controller"), tr("Control the volume level for each individual sound in openpilot."), "../frogpilot/assets/toggle_icons/icon_mute.png"}, diff --git a/selfdrive/ui/qt/util.cc b/selfdrive/ui/qt/util.cc index a83d353..6e004f9 100644 --- a/selfdrive/ui/qt/util.cc +++ b/selfdrive/ui/qt/util.cc @@ -26,7 +26,7 @@ QString getVersion() { } QString getBrand() { - return QObject::tr("FrogPilot"); + return QObject::tr("ClearPilot"); } QString getUserAgent() {