diff --git a/common/params_keys.h b/common/params_keys.h index 0afc57c5c6..32bf447493 100644 --- a/common/params_keys.h +++ b/common/params_keys.h @@ -93,6 +93,7 @@ inline static std::unordered_map keys = { {"Offroad_TemperatureTooHigh", CLEAR_ON_MANAGER_START}, {"Offroad_UnofficialHardware", CLEAR_ON_MANAGER_START}, {"Offroad_UpdateFailed", CLEAR_ON_MANAGER_START}, + {"OnroadCycleRequested", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION | CLEAR_ON_ONROAD_TRANSITION}, {"OpenpilotEnabledToggle", PERSISTENT}, {"PandaHeartbeatLost", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION}, {"PandaSomResetTriggered", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION}, @@ -106,7 +107,6 @@ inline static std::unordered_map keys = { {"SshEnabled", PERSISTENT}, {"TermsVersion", PERSISTENT}, {"TrainingVersion", PERSISTENT}, - {"ToggleRestart", CLEAR_ON_MANAGER_START | CLEAR_ON_OFFROAD_TRANSITION | CLEAR_ON_ONROAD_TRANSITION}, {"UbloxAvailable", PERSISTENT}, {"UpdateAvailable", CLEAR_ON_MANAGER_START | CLEAR_ON_ONROAD_TRANSITION}, {"UpdateFailedCount", CLEAR_ON_MANAGER_START}, diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 52e1087f3f..3cd7a25291 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -86,7 +86,10 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) { auto toggle = new ParamControl(param, title, desc, icon, this); if (needs_restart) { - toggle->setNotifyParam("ToggleRestart"); + QObject::connect(toggle, &ParamControl::toggleFlipped, [=](bool state) { + qDebug() << "put OnroadCycleRequested bool"; + params.putBool("OnroadCycleRequested", true); + }); } bool locked = params.getBool((param + "Lock").toStdString()); diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h index d88ea4e5b6..3342de5324 100644 --- a/selfdrive/ui/qt/widgets/controls.h +++ b/selfdrive/ui/qt/widgets/controls.h @@ -150,10 +150,6 @@ public: store_confirm = _store_confirm; } - void setNotifyParam(const QString &_notify_param) { - notify_param = _notify_param; - } - void setActiveIcon(const QString &icon) { active_icon_pixmap = QPixmap(icon).scaledToWidth(80, Qt::SmoothTransformation); } @@ -185,7 +181,6 @@ private: QPixmap active_icon_pixmap; bool confirm = false; bool store_confirm = false; - QString notify_param; }; class MultiButtonControl : public AbstractControl {