diff options
author | Jean-François Milants <jf@codingfield.com> | 2022-01-04 21:48:20 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2022-01-04 21:48:20 +0100 |
commit | dc8be2244ceb46fb58d2706935dc05b2d0ecdf8c (patch) | |
tree | 8e955bb1b6c11c65afcc30eb39174ab20bfa0437 /src/displayapp/DisplayApp.cpp | |
parent | b8b54f47a2a09e32186bf7d8dddc658fae2c6e5f (diff) | |
parent | bef3e708f6b5a6f71797f72aab89d09520813046 (diff) |
Merge branch 'geekbozu-ShakeWake' into develop
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
-rw-r--r-- | src/displayapp/DisplayApp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index 41a72a6f..7a73f123 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -48,6 +48,7 @@ #include "displayapp/screens/settings/SettingSetDate.h" #include "displayapp/screens/settings/SettingSetTime.h" #include "displayapp/screens/settings/SettingChimes.h" +#include "displayapp/screens/settings/SettingShakeThreshold.h" #include "libs/lv_conf.h" @@ -423,6 +424,10 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction) currentScreen = std::make_unique<Screens::SettingChimes>(this, settingsController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); break; + case Apps::SettingShakeThreshold: + currentScreen = std::make_unique<Screens::SettingShakeThreshold>(this, settingsController,motionController,*systemTask); + ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); + break; case Apps::BatteryInfo: currentScreen = std::make_unique<Screens::BatteryInfo>(this, batteryController); ReturnApp(Apps::Settings, FullRefreshDirections::Down, TouchEvents::SwipeDown); |