From 6f65751a4ec7da7fe806f9e17e66a3db33c8b246 Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Tue, 10 Mar 2026 13:36:59 -0500 Subject: [PATCH] Remove experimentalgmtune --- common/params.cc | 1 - frogpilot/common/frogpilot_variables.py | 6 ------ frogpilot/ui/qt/offroad/longitudinal_settings.cc | 1 - frogpilot/ui/qt/offroad/vehicle_settings.cc | 1 - frogpilot/ui/qt/offroad/vehicle_settings.h | 4 ++-- tools/StarPilot/feasibleparams.txt | 1 - tools/StarPilot/generate_pond_layout.py | 1 - 7 files changed, 2 insertions(+), 13 deletions(-) diff --git a/common/params.cc b/common/params.cc index 900448f86..283cf2a0c 100644 --- a/common/params.cc +++ b/common/params.cc @@ -328,7 +328,6 @@ std::unordered_map keys = { {"DynamicPathWidth", PERSISTENT}, {"DynamicPedalsOnUI", PERSISTENT}, {"EngageVolume", PERSISTENT}, - {"ExperimentalGMTune", PERSISTENT}, {"EVTuning", PERSISTENT}, {"TruckTuning", PERSISTENT}, {"Fahrenheit", PERSISTENT}, diff --git a/frogpilot/common/frogpilot_variables.py b/frogpilot/common/frogpilot_variables.py index d50fc6548..ac7da01f0 100644 --- a/frogpilot/common/frogpilot_variables.py +++ b/frogpilot/common/frogpilot_variables.py @@ -222,7 +222,6 @@ frogpilot_default_params: list[tuple[str, str | bytes, int, str]] = [ ("DynamicPathWidth", "0", 2, "0"), ("DynamicPedalsOnUI", "1", 2, "0"), ("EngageVolume", "101", 2, "101"), - ("ExperimentalGMTune", "0", 2, "0"), ("ExperimentalLongitudinalEnabled", "0", 0, "0"), ("ExperimentalModeConfirmed", "0", 0, "0"), ("Fahrenheit", "0", 3, "0"), @@ -827,11 +826,6 @@ class FrogPilotVariables: toggle.personality_profile_via_distance_very_long = toggle.openpilot_longitudinal and distance_button_control_very_long == BUTTON_FUNCTIONS["PERSONALITY_PROFILE"] toggle.traffic_mode_via_distance_very_long = toggle.openpilot_longitudinal and distance_button_control_very_long == BUTTON_FUNCTIONS["TRAFFIC_MODE"] - toggle.experimental_gm_tune = toggle.openpilot_longitudinal and toggle.car_make == "gm" and (params.get_bool("ExperimentalGMTune") if tuning_level >= level["ExperimentalGMTune"] else default.get_bool("ExperimentalGMTune")) - toggle.stoppingDecelRate = 0.3 if toggle.experimental_gm_tune else toggle.stoppingDecelRate - toggle.vEgoStarting = 0.15 if toggle.experimental_gm_tune else toggle.vEgoStarting - toggle.vEgoStopping = 0.15 if toggle.experimental_gm_tune else toggle.vEgoStopping - toggle.red_panda = toggle.car_make == "gm" and (params.get_bool("RedPanda") if tuning_level >= level["RedPanda"] else default.get_bool("RedPanda")) toggle.remote_start_boots_comma = toggle.car_make == "gm" and (params.get_bool("RemoteStartBootsComma") if tuning_level >= level["RemoteStartBootsComma"] else default.get_bool("RemoteStartBootsComma")) diff --git a/frogpilot/ui/qt/offroad/longitudinal_settings.cc b/frogpilot/ui/qt/offroad/longitudinal_settings.cc index 5d44b3ed8..73802b2f1 100644 --- a/frogpilot/ui/qt/offroad/longitudinal_settings.cc +++ b/frogpilot/ui/qt/offroad/longitudinal_settings.cc @@ -1651,7 +1651,6 @@ void FrogPilotLongitudinalPanel::updateToggles() { else if (key == "StoppingDecelRate" || key == "VEgoStarting" || key == "VEgoStopping") { - setVisible &= !isGM || !params.getBool("ExperimentalGMTune"); setVisible &= !isToyota || !params.getBool("FrogsGoMoosTweak"); } diff --git a/frogpilot/ui/qt/offroad/vehicle_settings.cc b/frogpilot/ui/qt/offroad/vehicle_settings.cc index 3754b4344..31551dd71 100644 --- a/frogpilot/ui/qt/offroad/vehicle_settings.cc +++ b/frogpilot/ui/qt/offroad/vehicle_settings.cc @@ -170,7 +170,6 @@ FrogPilotVehiclesPanel::FrogPilotVehiclesPanel(FrogPilotSettingsWindow *parent) std::vector> vehicleToggles { {"GMToggles", tr("General Motors Settings"), tr("FrogPilot features for General Motors vehicles."), ""}, - {"ExperimentalGMTune", tr("FrogsGoMoo's Experimental Tune"), tr("Experimental GM tune by FrogsGoMoo that attempts to smoothen stopping and takeoff control. Use at your own risk!"), ""}, {"GMPedalLongitudinal", tr("Use Pedal for Longitudinal Control"), tr("Use the pedal interceptor for longitudinal control instead of camera ACC/Redneck when available."), ""}, {"LongPitch", tr("Smooth Pedal Response on Hills"), tr("Smoothen acceleration and braking when driving downhill/uphill."), ""}, {"RedPanda", tr("Red Panda"), tr("Enable Red Panda behavior for GM (alternate safety config and bus numbering). Requires a reboot to take effect."), ""}, diff --git a/frogpilot/ui/qt/offroad/vehicle_settings.h b/frogpilot/ui/qt/offroad/vehicle_settings.h index 85f4a91ee..9e8056fd0 100644 --- a/frogpilot/ui/qt/offroad/vehicle_settings.h +++ b/frogpilot/ui/qt/offroad/vehicle_settings.h @@ -36,9 +36,9 @@ private: std::map toggles; - QSet gmKeys = {"ExperimentalGMTune", "GMPedalLongitudinal", "LongPitch", "RedPanda", "RemoteStartBootsComma", "VoltSNG"}; + QSet gmKeys = {"GMPedalLongitudinal", "LongPitch", "RedPanda", "RemoteStartBootsComma", "VoltSNG"}; QSet hkgKeys = {"NewLongAPI", "TacoTuneHacks"}; - QSet longitudinalKeys = {"ExperimentalGMTune", "FrogsGoMoosTweak", "LongPitch", "NewLongAPI", "SNGHack", "VoltSNG"}; + QSet longitudinalKeys = {"FrogsGoMoosTweak", "LongPitch", "NewLongAPI", "SNGHack", "VoltSNG"}; QSet toyotaKeys = {"ClusterOffset", "FrogsGoMoosTweak", "LockDoorsTimer", "SNGHack", "ToyotaDoors"}; QSet vehicleInfoKeys = {"BlindSpotSupport", "HardwareDetected", "OpenpilotLongitudinal", "PedalSupport", "RadarSupport", "SASCMSupport", "SDSUSupport", "SNGSupport"}; diff --git a/tools/StarPilot/feasibleparams.txt b/tools/StarPilot/feasibleparams.txt index e7abaa24c..57fdb81d1 100644 --- a/tools/StarPilot/feasibleparams.txt +++ b/tools/StarPilot/feasibleparams.txt @@ -99,7 +99,6 @@ DynamicPathWidth DynamicPedalsOnUI EVTuning EngageVolume -ExperimentalGMTune ExperimentalLongitudinalEnabled ExperimentalMode ExperimentalModeConfirmed diff --git a/tools/StarPilot/generate_pond_layout.py b/tools/StarPilot/generate_pond_layout.py index a8c6c8227..0d443cf9f 100755 --- a/tools/StarPilot/generate_pond_layout.py +++ b/tools/StarPilot/generate_pond_layout.py @@ -25,7 +25,6 @@ DROPDOWN_MAPPING = { # Keys explicitly hidden from The Pond's generic settings UI. HIDDEN_KEYS = { - "ExperimentalGMTune", "FrogsGoMoosTweak", "LockDoorsTimer", "NewLongAPI",