diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 21:41:29 (GMT) |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-12-09 21:41:29 (GMT) |
| commit | 6cf4a933b6323fc24a3b27ae55a3c12d31d6a841 (patch) | |
| tree | ffee2e59a62efe62aa8255f68e7cc89be1cad152 /src/displayapp/screens/SystemInfo.cpp | |
| parent | ae4b9e0f2e877d200bd780f99e2a8952f9f8bf5b (diff) | |
| parent | 42a5cdb5b776c2cdeb08a8c6f26606282a809178 (diff) | |
Merge remote-tracking branch 'upstream/develop' into pts-settings
Diffstat (limited to 'src/displayapp/screens/SystemInfo.cpp')
| -rw-r--r-- | src/displayapp/screens/SystemInfo.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp index c363e2d..e0138f8 100644 --- a/src/displayapp/screens/SystemInfo.cpp +++ b/src/displayapp/screens/SystemInfo.cpp @@ -1,3 +1,5 @@ +#include <FreeRTOS.h> +#include <task.h> #include "displayapp/screens/SystemInfo.h" #include <lvgl/lvgl.h> #include "displayapp/DisplayApp.h" @@ -41,8 +43,8 @@ SystemInfo::SystemInfo(Pinetime::Applications::DisplayApp* app, brightnessController {brightnessController}, bleController {bleController}, watchdog {watchdog}, - motionController{motionController}, - touchPanel{touchPanel}, + motionController {motionController}, + touchPanel {touchPanel}, screens {app, 0, {[this]() -> std::unique_ptr<Screen> { @@ -182,7 +184,7 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen3() { " #444444 used# %d (%d%%)\n" " #444444 max used# %lu\n" " #444444 frag# %d%%\n" - " #444444 free# %d", + " #444444 free# %d", bleAddr[5], bleAddr[4], bleAddr[3], @@ -274,4 +276,4 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen5() { lv_label_set_align(label, LV_LABEL_ALIGN_CENTER); lv_obj_align(label, lv_scr_act(), LV_ALIGN_CENTER, 0, 0); return std::make_unique<Screens::Label>(4, 5, app, label); -} +}
\ No newline at end of file |