From 0351e7d817efc8692cc0befd719a7c024bdd8fec Mon Sep 17 00:00:00 2001 From: firestar5683 <168790843+firestar5683@users.noreply.github.com> Date: Fri, 24 Jul 2026 15:02:07 -0500 Subject: [PATCH] No Tweak --- common/params_keys.h | 1 - opendbc_repo/opendbc/car/tests/test_car_interfaces.py | 1 - opendbc_repo/opendbc/car/toyota/carcontroller.py | 5 +---- selfdrive/car/tests/test_models.py | 1 - .../ui/layouts/settings/starpilot/longitudinal.py | 2 +- selfdrive/ui/layouts/settings/starpilot/vehicle.py | 7 ------- selfdrive/ui/translations/main_uk.ts | 4 ---- starpilot/common/safe_mode.py | 1 - starpilot/common/starpilot_variables.py | 11 ++++++----- starpilot/system/starpilot_stats.py | 2 +- starpilot/ui/qt/offroad/longitudinal_settings.cc | 1 - starpilot/ui/qt/offroad/vehicle_settings.cc | 1 - starpilot/ui/qt/offroad/vehicle_settings.h | 4 ++-- tools/StarPilot/feasibleparams.txt | 1 - tools/StarPilot/generate_galaxy_layout.py | 1 - 15 files changed, 11 insertions(+), 32 deletions(-) diff --git a/common/params_keys.h b/common/params_keys.h index 980c9865f..eda2c76ef 100644 --- a/common/params_keys.h +++ b/common/params_keys.h @@ -338,7 +338,6 @@ inline static std::unordered_map keys = { {"StarPilotFavoriteSlots", {PERSISTENT, JSON, "[]", "[]", 1}}, {"StarPilotStats", {PERSISTENT | DONT_LOG, JSON, "{}", "{}"}}, {"StarPilotTogglesUpdated", {CLEAR_ON_MANAGER_START, BOOL, "0", "0"}}, - {"FrogsGoMoosTweak", {PERSISTENT, BOOL, "1", "0", 2}}, {"GoatScream", {PERSISTENT, BOOL, "0", "0", 1, SETTINGS_SIMPLE}}, {"GoatScreamCriticalAlerts", {PERSISTENT, BOOL, "0", "0", 1, SETTINGS_SIMPLE}}, {"GreenLightAlert", {PERSISTENT, BOOL, "0", "0", 0, SETTINGS_SIMPLE}}, diff --git a/opendbc_repo/opendbc/car/tests/test_car_interfaces.py b/opendbc_repo/opendbc/car/tests/test_car_interfaces.py index 337f374eb..fa91fce91 100644 --- a/opendbc_repo/opendbc/car/tests/test_car_interfaces.py +++ b/opendbc_repo/opendbc/car/tests/test_car_interfaces.py @@ -73,7 +73,6 @@ def get_test_starpilot_toggles() -> SimpleNamespace: cluster_offset=1.0, disable_openpilot_long=False, force_fingerprint=False, - frogsgomoo_tweak=False, lock_doors=False, reverse_cruise_increase=False, sng_hack=False, diff --git a/opendbc_repo/opendbc/car/toyota/carcontroller.py b/opendbc_repo/opendbc/car/toyota/carcontroller.py index b9becc7b4..69f63b2bc 100644 --- a/opendbc_repo/opendbc/car/toyota/carcontroller.py +++ b/opendbc_repo/opendbc/car/toyota/carcontroller.py @@ -444,10 +444,7 @@ class CarController(CarControllerBase): self.aego.update(a_ego_blended) j_ego = (self.aego.x - prev_aego) / (DT_CTRL * 3) - if starpilot_toggles.frogsgomoo_tweak: - future_t = float(np.interp(CS.out.vEgo, [2., 5.], [0.35, 1.0])) - else: - future_t = float(np.interp(CS.out.vEgo, [2., 5.], [0.25, 0.5])) + future_t = float(np.interp(CS.out.vEgo, [2., 5.], [0.25, 0.5])) a_ego_future = a_ego_blended + j_ego * future_t if CC.longActive: diff --git a/selfdrive/car/tests/test_models.py b/selfdrive/car/tests/test_models.py index 5aa37bc44..287449668 100644 --- a/selfdrive/car/tests/test_models.py +++ b/selfdrive/car/tests/test_models.py @@ -42,7 +42,6 @@ def get_test_starpilot_toggles() -> SimpleNamespace: cluster_offset=1.0, disable_openpilot_long=False, force_fingerprint=False, - frogsgomoo_tweak=False, lock_doors=False, reverse_cruise_increase=False, sng_hack=False, diff --git a/selfdrive/ui/layouts/settings/starpilot/longitudinal.py b/selfdrive/ui/layouts/settings/starpilot/longitudinal.py index 40a18a180..989de61ba 100644 --- a/selfdrive/ui/layouts/settings/starpilot/longitudinal.py +++ b/selfdrive/ui/layouts/settings/starpilot/longitudinal.py @@ -467,7 +467,7 @@ class StarPilotLongitudinalLayout(_SettingsPage): return self._params.get_bool("AdvancedLongitudinalTune") def _show_stop_tuning_values(self) -> bool: - return self._advanced_enabled() and not (starpilot_state.car_state.isToyota and self._params.get_bool("FrogsGoMoosTweak")) + return self._advanced_enabled() def _make_parent(self, key: str, label: str, subtitle: str = "") -> ParentToggle: return ParentToggle( diff --git a/selfdrive/ui/layouts/settings/starpilot/vehicle.py b/selfdrive/ui/layouts/settings/starpilot/vehicle.py index 59968166f..c9e8c7b68 100644 --- a/selfdrive/ui/layouts/settings/starpilot/vehicle.py +++ b/selfdrive/ui/layouts/settings/starpilot/vehicle.py @@ -400,13 +400,6 @@ class VehicleSettingsManagerView(PanelManagerView): "get_state": lambda: self._controller._params.get_bool("SNGHack"), "set_state": lambda s: self._controller._on_toggle("SNGHack"), }) - if cs.isToyota and cs.hasOpenpilotLongitudinal: - toggles.append({ - "title": tr("FrogsGoMoo Tweak"), - "get_state": lambda: self._controller._params.get_bool("FrogsGoMoosTweak"), - "set_state": lambda s: self._controller._on_toggle("FrogsGoMoosTweak"), - }) - if cs.isBolt and cs.hasPedal: toggles.append({ "title": tr("Remap Cancel Button"), diff --git a/selfdrive/ui/translations/main_uk.ts b/selfdrive/ui/translations/main_uk.ts index 9d1978abc..dc93b11a5 100644 --- a/selfdrive/ui/translations/main_uk.ts +++ b/selfdrive/ui/translations/main_uk.ts @@ -4081,10 +4081,6 @@ Developer - Highly customizable settings for seasoned enthusiasts Automatically Lock/Unlock Doors Автоматичне блокування/розблокування дверей - - FrogsGoMoo's Personal Tweaks - Особисті налаштування FrogsGoMoo - Lock Doors On Ignition Off After Замикання дверей після вимкнення запалювання diff --git a/starpilot/common/safe_mode.py b/starpilot/common/safe_mode.py index 422fa06f9..50255c94b 100644 --- a/starpilot/common/safe_mode.py +++ b/starpilot/common/safe_mode.py @@ -182,7 +182,6 @@ SAFE_MODE_MANAGED_KEYS = ( "RelaxedJerkDanger", "RelaxedJerkSpeed", "RelaxedJerkSpeedDecrease", - "FrogsGoMoosTweak", "SNGHack", "ToyotaAutoHold", "SubaruSNG", diff --git a/starpilot/common/starpilot_variables.py b/starpilot/common/starpilot_variables.py index 68ff27724..01d28d3a3 100644 --- a/starpilot/common/starpilot_variables.py +++ b/starpilot/common/starpilot_variables.py @@ -656,6 +656,12 @@ class StarPilotVariables: toggle.stoppingDecelRate = CP.stoppingDecelRate toggle.vEgoStarting = CP.vEgoStarting toggle.vEgoStopping = CP.vEgoStopping + if toggle.openpilot_longitudinal and toggle.car_make == "toyota": + # Preserve StarPilot's established Toyota stop-state behavior without + # coupling it to the removed FrogsGoMoo controller experiment. + toggle.stoppingDecelRate = 0.01 + toggle.vEgoStarting = 0.1 + toggle.vEgoStopping = 0.5 # Keep stock tuning params synchronized for all device UIs. self._migrate_steer_delay_mode(steerActuatorDelay) @@ -1021,11 +1027,6 @@ class StarPilotVariables: toggle.bookmark_via_cancel_very_long = cancel_button_control_very_long == BUTTON_FUNCTIONS["BOOKMARK"] self.set_favorite_button_flags(toggle, "cancel_very_long", cancel_button_control_very_long) - toggle.frogsgomoo_tweak = self.get_value("FrogsGoMoosTweak", condition=toggle.openpilot_longitudinal and toggle.car_make == "toyota") - toggle.stoppingDecelRate = 0.01 if toggle.frogsgomoo_tweak else toggle.stoppingDecelRate - toggle.vEgoStarting = 0.1 if toggle.frogsgomoo_tweak else toggle.vEgoStarting - toggle.vEgoStopping = 0.5 if toggle.frogsgomoo_tweak else toggle.vEgoStopping - toggle.holiday_themes = self.get_value("HolidayThemes") toggle.current_holiday_theme = holiday_theme if toggle.holiday_themes else "stock" if toggle.current_holiday_theme != "stock": diff --git a/starpilot/system/starpilot_stats.py b/starpilot/system/starpilot_stats.py index 527b7bf45..3f3dc7dc6 100644 --- a/starpilot/system/starpilot_stats.py +++ b/starpilot/system/starpilot_stats.py @@ -200,7 +200,7 @@ def send_stats(): build_metadata = get_build_metadata() starpilot_toggles = get_starpilot_toggles() - frogs_go_moo = getattr(starpilot_toggles, "frogs_go_moo", getattr(starpilot_toggles, "frogsgomoo_tweak", False)) + frogs_go_moo = getattr(starpilot_toggles, "frogs_go_moo", False) if frogs_go_moo: return diff --git a/starpilot/ui/qt/offroad/longitudinal_settings.cc b/starpilot/ui/qt/offroad/longitudinal_settings.cc index 7ba96d8fe..d7984dc32 100644 --- a/starpilot/ui/qt/offroad/longitudinal_settings.cc +++ b/starpilot/ui/qt/offroad/longitudinal_settings.cc @@ -1069,7 +1069,6 @@ void StarPilotLongitudinalPanel::updateToggles() { else if (key == "StoppingDecelRate" || key == "VEgoStarting" || key == "VEgoStopping") { setVisible &= !parent->isGM || !params.getBool("ExperimentalGMTune"); - setVisible &= !parent->isToyota || !params.getBool("FrogsGoMoosTweak"); } } diff --git a/starpilot/ui/qt/offroad/vehicle_settings.cc b/starpilot/ui/qt/offroad/vehicle_settings.cc index 8bb3db851..2eedb78a5 100644 --- a/starpilot/ui/qt/offroad/vehicle_settings.cc +++ b/starpilot/ui/qt/offroad/vehicle_settings.cc @@ -198,7 +198,6 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent, {"ToyotaToggles", tr("Toyota/Lexus Settings"), tr("StarPilot features for Lexus and Toyota vehicles."), ""}, {"ToyotaDoors", tr("Automatically Lock/Unlock Doors"), tr("Automatically lock/unlock doors when shifting in and out of drive."), ""}, {"ClusterOffset", tr("Dashboard Speed Offset"), tr("The speed offset openpilot uses to match the speed on the dashboard display."), ""}, - {"FrogsGoMoosTweak", tr("FrogsGoMoo's Personal Tweaks"), tr("Personal tweaks by FrogsGoMoo for quicker acceleration and smoother braking."), ""}, {"LockDoorsTimer", tr("Lock Doors On Ignition Off After"), tr("Automatically lock the doors on ignition off when no one is detected in the front seats."), ""}, {"SNGHack", tr("Stop-and-Go Hack"), tr("Force stop-and-go on Lexus/Toyota vehicles without stock stop-and-go functionality."), ""}, diff --git a/starpilot/ui/qt/offroad/vehicle_settings.h b/starpilot/ui/qt/offroad/vehicle_settings.h index 7142121fa..3ebb7f802 100644 --- a/starpilot/ui/qt/offroad/vehicle_settings.h +++ b/starpilot/ui/qt/offroad/vehicle_settings.h @@ -26,9 +26,9 @@ private: QSet chryslerKeys = {"JeepBrakeHold"}; QSet gmKeys = {"GMPedalLongitudinal", "GMDashSpoofOffsets", "IgnoreIgnitionLine", "LongPitch", "RemoteStartBootsComma", "RemapCancelToDistance", "VoltSNG"}; QSet hkgKeys = {"HKGRemoteStartBootsComma"}; - QSet longitudinalKeys = {"FrogsGoMoosTweak", "GMDashSpoofOffsets", "LongPitch", "RemapCancelToDistance", "SNGHack", "VoltSNG"}; + QSet longitudinalKeys = {"GMDashSpoofOffsets", "LongPitch", "RemapCancelToDistance", "SNGHack", "VoltSNG"}; QSet subaruKeys = {"SubaruSNG", "SubaruSNGManualParkingBrake"}; - QSet toyotaKeys = {"ClusterOffset", "FrogsGoMoosTweak", "LockDoorsTimer", "SNGHack", "ToyotaDoors"}; + QSet toyotaKeys = {"ClusterOffset", "LockDoorsTimer", "SNGHack", "ToyotaDoors"}; QSet vehicleInfoKeys = {"BlindSpotSupport", "HardwareDetected", "OpenpilotLongitudinal", "PedalSupport", "RadarSupport", "SDSUSupport", "SNGSupport"}; QSet parentKeys; diff --git a/tools/StarPilot/feasibleparams.txt b/tools/StarPilot/feasibleparams.txt index 3f3d2d3bb..3cca18831 100644 --- a/tools/StarPilot/feasibleparams.txt +++ b/tools/StarPilot/feasibleparams.txt @@ -110,7 +110,6 @@ ForceStandstill ForceStopDistanceOffset ForceStops ForceTorqueController -FrogsGoMoosTweak GMDashSpoofOffsets GMPedalLongitudinal HKGRemoteStartBootsComma diff --git a/tools/StarPilot/generate_galaxy_layout.py b/tools/StarPilot/generate_galaxy_layout.py index 1ad9153a7..40cfcbd24 100755 --- a/tools/StarPilot/generate_galaxy_layout.py +++ b/tools/StarPilot/generate_galaxy_layout.py @@ -61,7 +61,6 @@ INJECTED_SECTION_PARAMS = { # Keys explicitly hidden from The Galaxy's generic settings UI. HIDDEN_KEYS = { - "FrogsGoMoosTweak", "HumanAcceleration", "DisableWideRoad", "LockDoorsTimer",