diff options
| author | Tim Keller <geekboy1011@gmail.com> | 2021-11-12 00:53:27 +0000 |
|---|---|---|
| committer | Tim Keller <geekboy1011@gmail.com> | 2022-01-04 02:06:16 +0000 |
| commit | e82469bffac6383ab898fa71dc3a88e164dc86ff (patch) | |
| tree | a165502e615b4585fd89dde51f0ad8b1d5a50723 | |
| parent | f86c71b2bb4290adece06fb4cd0aed333201d9fa (diff) | |
Fix setting removing it self from wake settings when opening calibration window twice.
| -rw-r--r-- | src/displayapp/screens/settings/SettingShakeThreshold.cpp | 1 | ||||
| -rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/displayapp/screens/settings/SettingShakeThreshold.cpp b/src/displayapp/screens/settings/SettingShakeThreshold.cpp index 06e233c4..1791b550 100644 --- a/src/displayapp/screens/settings/SettingShakeThreshold.cpp +++ b/src/displayapp/screens/settings/SettingShakeThreshold.cpp @@ -63,6 +63,7 @@ SettingShakeThreshold::SettingShakeThreshold(DisplayApp* app, vDecay = xTaskGetTickCount(); calibrating = false; + EnableForCal = false; if(!settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::Shake)){ EnableForCal = true; settingsController.setWakeUpMode(Pinetime::Controllers::Settings::WakeUpMode::Shake,true); diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index ea72ec96..e59d68e4 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -57,10 +57,10 @@ std::unique_ptr<Screen> Settings::CreateScreen2() { std::unique_ptr<Screen> Settings::CreateScreen3() { - std::array<Screens::List::Applications, 4> applications {{{Symbols::paintbrush, "PTS Colors", Apps::SettingPineTimeStyle}, - {Symbols::none, "Wake Sense", Apps::SettingShakeThreshold}, + std::array<Screens::List::Applications, 4> applications {{{Symbols::none, "Wake Sense", Apps::SettingShakeThreshold}, {Symbols::check, "Firmware", Apps::FirmwareValidation}, - {Symbols::list, "About", Apps::SysInfo} + {Symbols::list, "About", Apps::SysInfo}, + {Symbols::none, "None", Apps::None} }}; |