diff --git a/common/params_keys.h b/common/params_keys.h index d15d396ac..32b277664 100644 --- a/common/params_keys.h +++ b/common/params_keys.h @@ -555,7 +555,6 @@ inline static std::unordered_map keys = { {"SwitchbackModeEnabled", {CLEAR_ON_OFFROAD_TRANSITION, BOOL, "0", "0"}}, {"SubaruSNG", {PERSISTENT, BOOL, "1", "0", 2}}, {"TacoTune", {PERSISTENT, BOOL, "0", "0", 2}}, - {"TacoTuneHacks", {PERSISTENT, BOOL, "0", "0", 2}}, {"TestAlert", {CLEAR_ON_MANAGER_START, STRING, "", ""}}, {"TetheringEnabled", {PERSISTENT, INT, "0", "0", 0}}, {"ThemeDownloadProgress", {CLEAR_ON_MANAGER_START, STRING, "", ""}}, diff --git a/selfdrive/ui/layouts/settings/starpilot/vehicle.py b/selfdrive/ui/layouts/settings/starpilot/vehicle.py index a82be8a18..51341f40c 100644 --- a/selfdrive/ui/layouts/settings/starpilot/vehicle.py +++ b/selfdrive/ui/layouts/settings/starpilot/vehicle.py @@ -441,9 +441,6 @@ class VehicleSettingsManagerView(Widget): if cs.isGM and cs.isVolt and not cs.hasSNG: rows.append({"target_id": "toggle:VoltSNG", "type": "toggle", "title": tr("Volt SNG Hack"), "get_state": lambda: self._controller._params.get_bool("VoltSNG")}) - if cs.isHKG and cs.isHKGCanFd: - rows.append({"target_id": "toggle:TacoTuneHacks", "type": "toggle", - "title": tr("Taco Bell Torque Hack"), "get_state": lambda: self._controller._params.get_bool("TacoTuneHacks")}) if cs.isSubaru: rows.append({"target_id": "toggle:SubaruSNG", "type": "toggle", "title": tr("Stop and Go"), "get_state": lambda: self._controller._params.get_bool("SubaruSNG")}) diff --git a/starpilot/common/safe_mode.py b/starpilot/common/safe_mode.py index 5e8d82b70..88cc4ee36 100644 --- a/starpilot/common/safe_mode.py +++ b/starpilot/common/safe_mode.py @@ -173,7 +173,6 @@ SAFE_MODE_MANAGED_KEYS = ( "GMPedalLongitudinal", "GMDashSpoofOffsets", "LongPitch", - "TacoTuneHacks", ) SAFE_MODE_FIXED_VALUES = { diff --git a/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json b/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json index aafa00513..f2e48583b 100644 --- a/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json +++ b/starpilot/system/the_pond/assets/components/tools/device_settings_layout.json @@ -2287,13 +2287,6 @@ "data_type": "bool", "ui_type": "toggle" }, - { - "key": "TacoTuneHacks", - "label": "\\\"Taco Bell Run\\\" Torque Hack", - "description": "The steering torque hack from comma's 2022 \"Taco Bell Run\". Designed to increase steering torque at low speeds for left and right turns.", - "data_type": "bool", - "ui_type": "toggle" - }, { "key": "SubaruSNG", "label": "Stop and Go", diff --git a/starpilot/ui/qt/offroad/vehicle_settings.cc b/starpilot/ui/qt/offroad/vehicle_settings.cc index 8766684cf..e094cdfa3 100644 --- a/starpilot/ui/qt/offroad/vehicle_settings.cc +++ b/starpilot/ui/qt/offroad/vehicle_settings.cc @@ -155,19 +155,16 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent, settingsList->addItem(disableOpenpilotLong); StarPilotListWidget *gmList = new StarPilotListWidget(this); - StarPilotListWidget *hkgList = new StarPilotListWidget(this); StarPilotListWidget *subaruList = new StarPilotListWidget(this); StarPilotListWidget *toyotaList = new StarPilotListWidget(this); StarPilotListWidget *vehicleInfoList = new StarPilotListWidget(this); ScrollView *gmPanel = new ScrollView(gmList, this); - ScrollView *hkgPanel = new ScrollView(hkgList, this); ScrollView *subaruPanel = new ScrollView(subaruList, this); ScrollView *toyotaPanel = new ScrollView(toyotaList, this); ScrollView *vehicleInfoPanel = new ScrollView(vehicleInfoList, this); vehiclesLayout->addWidget(gmPanel); - vehiclesLayout->addWidget(hkgPanel); vehiclesLayout->addWidget(subaruPanel); vehiclesLayout->addWidget(toyotaPanel); vehiclesLayout->addWidget(vehicleInfoPanel); @@ -181,8 +178,6 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent, {"RemapCancelToDistance", tr("Remap Cancel Button"), tr("On pedal-interceptor Bolts, treat the steering-wheel CANCEL button as an extra mappable button."), ""}, {"VoltSNG", tr("Stop-and-Go Hack"), tr("Force stop-and-go on the 2017 Chevy Volt."), ""}, - {"HKGToggles", tr("Hyundai/Kia/Genesis Settings"), tr("StarPilot features for Genesis, Hyundai, and Kia vehicles."), ""}, - {"TacoTuneHacks", tr("\"Taco Bell Run\" Torque Hack"), tr("The steering torque hack from comma's 2022 \"Taco Bell Run\". Designed to increase steering torque at low speeds for left and right turns."), ""}, {"SubaruToggles", tr("Subaru Settings"), tr("StarPilot features for Subaru vehicles."), ""}, {"SubaruSNG", tr("Stop and Go"), tr("Stop and go for supported Subaru vehicles."), ""}, @@ -215,14 +210,6 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent, }); vehicleToggle = gmButton; - } else if (param == "HKGToggles") { - ButtonControl *hkgButton = new ButtonControl(title, tr("MANAGE"), desc); - QObject::connect(hkgButton, &ButtonControl::clicked, [vehiclesLayout, hkgPanel, this]() { - openDescriptions(forceOpenDescriptions, toggles); - vehiclesLayout->setCurrentWidget(hkgPanel); - }); - vehicleToggle = hkgButton; - } else if (param == "SubaruToggles") { ButtonControl *subaruButton = new ButtonControl(title, tr("MANAGE"), desc); QObject::connect(subaruButton, &ButtonControl::clicked, [vehiclesLayout, subaruPanel, this]() { @@ -275,8 +262,6 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent, if (gmKeys.contains(param)) { gmList->addItem(vehicleToggle); - } else if (hkgKeys.contains(param)) { - hkgList->addItem(vehicleToggle); } else if (subaruKeys.contains(param)) { subaruList->addItem(vehicleToggle); } else if (toyotaKeys.contains(param)) { @@ -303,18 +288,12 @@ StarPilotVehiclesPanel::StarPilotVehiclesPanel(StarPilotSettingsWindow *parent, static_cast(toggles["LockDoorsTimer"])->setWarning("Warning: openpilot can't detect if keys are still inside the car, so ensure you have a spare key to prevent accidental lockouts!"); - QSet rebootKeys = {"RemapCancelToDistance", "TacoTuneHacks"}; + QSet rebootKeys = {"RemapCancelToDistance"}; for (const QString &key : rebootKeys) { QObject::connect(static_cast(toggles[key]), &ToggleControl::toggleFlipped, [key, this](bool state) { if (started) { - if (key == "TacoTuneHacks" && state) { - if (StarPilotConfirmationDialog::toggleReboot(this)) { - Hardware::reboot(); - } - } else if (key != "TacoTuneHacks") { - if (StarPilotConfirmationDialog::toggleReboot(this)) { - Hardware::reboot(); - } + if (StarPilotConfirmationDialog::toggleReboot(this)) { + Hardware::reboot(); } } }); @@ -408,8 +387,6 @@ void StarPilotVehiclesPanel::updateToggles() { if (!showAllToggles) { if (gmKeys.contains(key)) { setVisible &= parent->isGM; - } else if (hkgKeys.contains(key)) { - setVisible &= parent->isHKG; } else if (subaruKeys.contains(key)) { setVisible &= parent->isSubaru; } else if (toyotaKeys.contains(key)) { @@ -442,10 +419,6 @@ void StarPilotVehiclesPanel::updateToggles() { setVisible &= parent->hasSNG; } - else if (key == "TacoTuneHacks") { - setVisible &= parent->isHKGCanFd; - } - else if (key == "VoltSNG") { setVisible &= parent->isVolt && !parent->hasSNG; } @@ -456,8 +429,6 @@ void StarPilotVehiclesPanel::updateToggles() { if (setVisible) { if (gmKeys.contains(key)) { toggles["GMToggles"]->setVisible(true); - } else if (hkgKeys.contains(key)) { - toggles["HKGToggles"]->setVisible(true); } else if (subaruKeys.contains(key)) { toggles["SubaruToggles"]->setVisible(true); } else if (toyotaKeys.contains(key)) { diff --git a/starpilot/ui/qt/offroad/vehicle_settings.h b/starpilot/ui/qt/offroad/vehicle_settings.h index a09a01a36..1485b6e99 100644 --- a/starpilot/ui/qt/offroad/vehicle_settings.h +++ b/starpilot/ui/qt/offroad/vehicle_settings.h @@ -24,7 +24,6 @@ private: std::map toggles; QSet gmKeys = {"GMPedalLongitudinal", "GMDashSpoofOffsets", "LongPitch", "RemoteStartBootsComma", "RemapCancelToDistance", "VoltSNG"}; - QSet hkgKeys = {"TacoTuneHacks"}; QSet longitudinalKeys = {"FrogsGoMoosTweak", "GMDashSpoofOffsets", "LongPitch", "RemapCancelToDistance", "SNGHack", "VoltSNG"}; QSet subaruKeys = {"SubaruSNG"}; QSet toyotaKeys = {"ClusterOffset", "FrogsGoMoosTweak", "LockDoorsTimer", "SNGHack", "ToyotaDoors"}; diff --git a/tools/StarPilot/feasibleparams.txt b/tools/StarPilot/feasibleparams.txt index d1e8ab63f..077769551 100644 --- a/tools/StarPilot/feasibleparams.txt +++ b/tools/StarPilot/feasibleparams.txt @@ -310,7 +310,6 @@ StoppedTimer StoppingDecelRate StoppingDecelRateStock TacoTune -TacoTuneHacks TetheringEnabled ToyotaDoors TrafficFollow