diff --git a/selfdrive/frogpilot/ui/control_settings.cc b/selfdrive/frogpilot/ui/control_settings.cc index da081a6..f2658cf 100644 --- a/selfdrive/frogpilot/ui/control_settings.cc +++ b/selfdrive/frogpilot/ui/control_settings.cc @@ -1,7 +1,7 @@ #include "selfdrive/frogpilot/ui/control_settings.h" #include "selfdrive/ui/ui.h" -FrogPilotControlsPanel::FrogPilotControlsPanel(SettingsWindow *parent) : FrogPilotListWidget(parent) { +FrogPilotControlsPanel::FrogPilotControlsPanel(OscarSettingsWindow *parent) : FrogPilotListWidget(parent) { const std::vector> controlToggles { {"AdjustablePersonalities", "Adjustable Personalities", "Use the 'Distance' button on the steering wheel or the onroad UI to switch between openpilot's driving personalities.\n\n1 bar = Aggressive\n2 bars = Standard\n3 bars = Relaxed", "../frogpilot/assets/toggle_icons/icon_distance.png"}, {"AlwaysOnLateral", "Always on Lateral", "Maintain openpilot lateral control when the brake or gas pedals are used.\n\nDeactivation occurs only through the 'Cruise Control' button.", "../frogpilot/assets/toggle_icons/icon_always_on_lateral.png"}, diff --git a/selfdrive/frogpilot/ui/control_settings.h b/selfdrive/frogpilot/ui/control_settings.h index b029249..6f80379 100644 --- a/selfdrive/frogpilot/ui/control_settings.h +++ b/selfdrive/frogpilot/ui/control_settings.h @@ -2,6 +2,7 @@ #include +#include "selfdrive/oscarpilot/settings/settings.h" #include "selfdrive/frogpilot/ui/frogpilot_functions.h" #include "selfdrive/ui/qt/offroad/settings.h" @@ -9,7 +10,7 @@ class FrogPilotControlsPanel : public FrogPilotListWidget { Q_OBJECT public: - explicit FrogPilotControlsPanel(SettingsWindow *parent); + explicit FrogPilotControlsPanel(OscarSettingsWindow *parent); signals: void closeParentToggle();