diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-03-20 11:41:49 +0100 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-03-20 11:41:49 +0100 |
commit | 405c85c160b0d72407498a25555677d484b822f1 (patch) | |
tree | 71b22af329f7b5ee7a6f37ddca4c738f0e379593 /src/displayapp/screens/SystemInfo.cpp | |
parent | e63596b291f973cdeb01cd0ac276861895bd4489 (diff) | |
parent | 9e9bb2085e70a9c8b8c2e74f6027f5392e366158 (diff) |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
# Conflicts:
# src/main.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/displayapp/screens/SystemInfo.cpp')
-rw-r--r-- | src/displayapp/screens/SystemInfo.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index 2de5dada..3c6d1d9d 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -20,11 +20,14 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp *app, Screen(app), dateTimeController{dateTimeController}, batteryController{batteryController}, brightnessController{brightnessController}, bleController{bleController}, watchdog{watchdog}, - screens{app, { + screens{app, + 0, + { [this]() -> std::unique_ptr<Screen> { return CreateScreen1(); }, [this]() -> std::unique_ptr<Screen> { return CreateScreen2(); }, [this]() -> std::unique_ptr<Screen> { return CreateScreen3(); } - } + }, + Screens::ScreenListModes::UpDown } {} |