From 934aa7acd236023bdb084d900037ecc4e6966cc8 Mon Sep 17 00:00:00 2001 From: Jason Wen Date: Tue, 26 Sep 2023 21:46:31 -0400 Subject: [PATCH] ui: Controls Panel: slight cleanup (#301) --- selfdrive/ui/qt/offroad/sunnypilot_settings.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/selfdrive/ui/qt/offroad/sunnypilot_settings.cc b/selfdrive/ui/qt/offroad/sunnypilot_settings.cc index 850e2303bb..f803b1b475 100644 --- a/selfdrive/ui/qt/offroad/sunnypilot_settings.cc +++ b/selfdrive/ui/qt/offroad/sunnypilot_settings.cc @@ -267,19 +267,18 @@ SPControlsPanel::SPControlsPanel(QWidget *parent) : ListWidget(parent) { // toggle names to trigger updateToggles() when toggleFlipped std::vector updateTogglesNames{ - "EnableMads", "CustomOffsets", "EnforceTorqueLateral", - "SpeedLimitPercOffset", "SpeedLimitControl" + "EnableMads", "CustomOffsets", "EnforceTorqueLateral", "SpeedLimitPercOffset", "SpeedLimitControl", + "CustomTorqueLateral", "LiveTorque" }; connect(dynamic_lane_profile, &DynamicLaneProfile::updateExternalToggles, this, &SPControlsPanel::updateToggles); - // toggle names to trigger updateToggles() when toggleFlipped and display ConfirmationDialog::alert + // toggle names to display ConfirmationDialog::alert std::vector updateTogglesNamesAlert{ "CustomTorqueLateral", "LiveTorque" }; // toggle for offroadTransition when going onroad/offroad std::vector toggleOffroad{ - "EnableMads", "DisengageLateralOnBrake", "AccMadsCombo", "MadsCruiseMain", "BelowSpeedPause", "EnforceTorqueLateral", - "CustomTorqueLateral", "LiveTorque" + "EnableMads", "DisengageLateralOnBrake", "AccMadsCombo", "MadsCruiseMain", "BelowSpeedPause", "EnforceTorqueLateral" }; // Controls: Camera Offset (cm) @@ -362,7 +361,6 @@ SPControlsPanel::SPControlsPanel(QWidget *parent) : ListWidget(parent) { // trigger updateToggles() and display ConfirmationDialog::alert when toggleFlipped if (std::find(updateTogglesNamesAlert.begin(), updateTogglesNamesAlert.end(), param.toStdString()) != updateTogglesNamesAlert.end()) { connect(toggle, &ToggleControl:: toggleFlipped, [=](bool state) { - updateToggles(); ConfirmationDialog::alert(tr("You must restart your car or your device to apply these changes."), this); }); }