diff options
author | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
---|---|---|
committer | SteveAmor <SteveAmor@users.noreply.github.com> | 2022-01-02 22:27:43 +0000 |
commit | cc259b6a4ac93d507fa372a41ea653dedeb791ea (patch) | |
tree | 3c8b8b937b2b91149003195679ce5acda1154c4d /src/displayapp/screens/settings/Settings.cpp | |
parent | 94561b233136334c7507925b04a345adb0e6c769 (diff) | |
parent | e0013e730448f4dc142e3610f970f22c807ac41e (diff) |
resolves conflicts
Diffstat (limited to 'src/displayapp/screens/settings/Settings.cpp')
-rw-r--r-- | src/displayapp/screens/settings/Settings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp index 678ad82e..3bc1372c 100644 --- a/src/displayapp/screens/settings/Settings.cpp +++ b/src/displayapp/screens/settings/Settings.cpp @@ -1,4 +1,4 @@ -#include "Settings.h" +#include "displayapp/screens/settings/Settings.h" #include <lvgl/lvgl.h> #include <array> #include "displayapp/screens/List.h" @@ -60,6 +60,7 @@ std::unique_ptr<Screen> Settings::CreateScreen2() { std::unique_ptr<Screen> Settings::CreateScreen3() { std::array<Screens::List::Applications, 4> applications {{ + {Symbols::clock, "Chimes", Apps::SettingChimes}, {Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::list, "About", Apps::SysInfo}, |