mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-07-25 11:12:13 +08:00
No Tweak
This commit is contained in:
@@ -338,7 +338,6 @@ inline static std::unordered_map<std::string, ParamKeyAttributes> 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}},
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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"),
|
||||
|
||||
@@ -4081,10 +4081,6 @@ Developer - Highly customizable settings for seasoned enthusiasts</source>
|
||||
<source>Automatically Lock/Unlock Doors</source>
|
||||
<translation>Автоматичне блокування/розблокування дверей</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>FrogsGoMoo's Personal Tweaks</source>
|
||||
<translation>Особисті налаштування FrogsGoMoo</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Lock Doors On Ignition Off After</source>
|
||||
<translation>Замикання дверей після вимкнення запалювання</translation>
|
||||
|
||||
@@ -182,7 +182,6 @@ SAFE_MODE_MANAGED_KEYS = (
|
||||
"RelaxedJerkDanger",
|
||||
"RelaxedJerkSpeed",
|
||||
"RelaxedJerkSpeedDecrease",
|
||||
"FrogsGoMoosTweak",
|
||||
"SNGHack",
|
||||
"ToyotaAutoHold",
|
||||
"SubaruSNG",
|
||||
|
||||
@@ -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":
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -198,7 +198,6 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent,
|
||||
{"ToyotaToggles", tr("Toyota/Lexus Settings"), tr("<b>StarPilot features for Lexus and Toyota vehicles.</b>"), ""},
|
||||
{"ToyotaDoors", tr("Automatically Lock/Unlock Doors"), tr("<b>Automatically lock/unlock doors</b> when shifting in and out of drive."), ""},
|
||||
{"ClusterOffset", tr("Dashboard Speed Offset"), tr("<b>The speed offset openpilot uses to match the speed on the dashboard display.</b>"), ""},
|
||||
{"FrogsGoMoosTweak", tr("FrogsGoMoo's Personal Tweaks"), tr("<b>Personal tweaks by FrogsGoMoo for quicker acceleration and smoother braking.</b>"), ""},
|
||||
{"LockDoorsTimer", tr("Lock Doors On Ignition Off After"), tr("<b>Automatically lock the doors on ignition off</b> when no one is detected in the front seats."), ""},
|
||||
{"SNGHack", tr("Stop-and-Go Hack"), tr("<b>Force stop-and-go</b> on Lexus/Toyota vehicles without stock stop-and-go functionality."), ""},
|
||||
|
||||
|
||||
@@ -26,9 +26,9 @@ private:
|
||||
QSet<QString> chryslerKeys = {"JeepBrakeHold"};
|
||||
QSet<QString> gmKeys = {"GMPedalLongitudinal", "GMDashSpoofOffsets", "IgnoreIgnitionLine", "LongPitch", "RemoteStartBootsComma", "RemapCancelToDistance", "VoltSNG"};
|
||||
QSet<QString> hkgKeys = {"HKGRemoteStartBootsComma"};
|
||||
QSet<QString> longitudinalKeys = {"FrogsGoMoosTweak", "GMDashSpoofOffsets", "LongPitch", "RemapCancelToDistance", "SNGHack", "VoltSNG"};
|
||||
QSet<QString> longitudinalKeys = {"GMDashSpoofOffsets", "LongPitch", "RemapCancelToDistance", "SNGHack", "VoltSNG"};
|
||||
QSet<QString> subaruKeys = {"SubaruSNG", "SubaruSNGManualParkingBrake"};
|
||||
QSet<QString> toyotaKeys = {"ClusterOffset", "FrogsGoMoosTweak", "LockDoorsTimer", "SNGHack", "ToyotaDoors"};
|
||||
QSet<QString> toyotaKeys = {"ClusterOffset", "LockDoorsTimer", "SNGHack", "ToyotaDoors"};
|
||||
QSet<QString> vehicleInfoKeys = {"BlindSpotSupport", "HardwareDetected", "OpenpilotLongitudinal", "PedalSupport", "RadarSupport", "SDSUSupport", "SNGSupport"};
|
||||
|
||||
QSet<QString> parentKeys;
|
||||
|
||||
@@ -110,7 +110,6 @@ ForceStandstill
|
||||
ForceStopDistanceOffset
|
||||
ForceStops
|
||||
ForceTorqueController
|
||||
FrogsGoMoosTweak
|
||||
GMDashSpoofOffsets
|
||||
GMPedalLongitudinal
|
||||
HKGRemoteStartBootsComma
|
||||
|
||||
@@ -61,7 +61,6 @@ INJECTED_SECTION_PARAMS = {
|
||||
|
||||
# Keys explicitly hidden from The Galaxy's generic settings UI.
|
||||
HIDDEN_KEYS = {
|
||||
"FrogsGoMoosTweak",
|
||||
"HumanAcceleration",
|
||||
"DisableWideRoad",
|
||||
"LockDoorsTimer",
|
||||
|
||||
Reference in New Issue
Block a user