mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-09-29 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: Disallow SLC toggles if longitudinal is off or not available

Browse Source
This commit is contained in:
Jason Wen
2023-11-06 09:44:32 -05:00
parent 45babf70df
commit 3d1cac8946
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.cc
+11 -1
View File
@@ -164,7 +164,7 @@ SunnypilotPanel::SunnypilotPanel(QWidget *parent) : QFrame(parent) {
});
// SLC. Settings
SubPanelButton *slcSettings = new SubPanelButton(tr("Customize Speed Limit Control"), 900, this);
slcSettings = new SubPanelButton(tr("Customize Speed Limit Control"), 900, this);
slcSettings->setObjectName("slc_btn");
// Set margin on the outside of the button
QVBoxLayout* slcSettingsLayout = new QVBoxLayout;
@@ -377,6 +377,7 @@ void SunnypilotPanel::updateToggles() {
auto v_tsc = toggles["TurnVisionControl"];
auto m_tsc = toggles["TurnSpeedControl"];
auto reverse_acc = toggles["ReverseAccChange"];
auto slc_toggle = toggles["EnableSlc"];
// toggle names to update when EnforceTorqueLateral is flipped
std::vector<std::string> enforceTorqueGroup{"CustomTorqueLateral", "LiveTorque", "LiveTorqueRelaxed", "TorquedOverride"};
@@ -418,15 +419,24 @@ void SunnypilotPanel::updateToggles() {
v_tsc->setEnabled(true);
m_tsc->setEnabled(true);
reverse_acc->setEnabled(true);
slc_toggle->setEnabled(true);
} else {
v_tsc->setEnabled(false);
m_tsc->setEnabled(false);
reverse_acc->setEnabled(false);
slc_toggle->setEnabled(false);
params.remove("EnableSlc");
slcSettings->setEnabled(false);
}
enforce_torque_lateral->refresh();
slc_toggle->refresh();
} else {
v_tsc->setEnabled(false);
m_tsc->setEnabled(false);
reverse_acc->setEnabled(false);
slc_toggle->setEnabled(false);
slcSettings->setEnabled(false);
}
}
selfdrive/ui/qt/offroad/sunnypilot/sunnypilot_settings.h
+1
View File
@@ -48,6 +48,7 @@ private:
QStackedLayout* main_layout = nullptr;
QWidget* sunnypilotScreen = nullptr;
MadsSettings* mads_settings = nullptr;
SubPanelButton *slcSettings = nullptr;
SlcSettings* slc_settings = nullptr;
LaneChangeSettings* lane_change_settings = nullptr;
CustomOffsetsSettings* custom_offsets_settings = nullptr;