diff options
| author | Riku Isokoski <riksu9000@gmail.com> | 2023-02-25 13:29:07 +0200 |
|---|---|---|
| committer | Riku Isokoski <riksu9000@gmail.com> | 2023-02-25 16:58:10 +0200 |
| commit | 6f942e20ed5881e0b520f4c4f0f1fd2ffb4a3a2b (patch) | |
| tree | e8180358fe5d274b853c5157baee6e085c320fff /src/displayapp/DisplayApp.cpp | |
| parent | ff34cf196ef16d5c06278e45567015e0e06a8c48 (diff) | |
LittleVgl: Instantiate in DisplayApp
LVGL is only a part of the main DisplayApp. Other "DisplayApps" can be
implemented without LVGL.
DummyLittleVgl isn't needed anymore and has been removed
Diffstat (limited to 'src/displayapp/DisplayApp.cpp')
| -rw-r--r-- | src/displayapp/DisplayApp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp index bf1d0e64..d910875e 100644 --- a/src/displayapp/DisplayApp.cpp +++ b/src/displayapp/DisplayApp.cpp @@ -60,7 +60,6 @@ namespace { } DisplayApp::DisplayApp(Drivers::St7789& lcd, - Components::LittleVgl& lvgl, const Drivers::Cst816S& touchPanel, const Controllers::Battery& batteryController, const Controllers::Ble& bleController, @@ -77,7 +76,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd, Pinetime::Controllers::TouchHandler& touchHandler, Pinetime::Controllers::FS& filesystem) : lcd {lcd}, - lvgl {lvgl}, touchPanel {touchPanel}, batteryController {batteryController}, bleController {bleController}, @@ -92,7 +90,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd, alarmController {alarmController}, brightnessController {brightnessController}, touchHandler {touchHandler}, - filesystem {filesystem} { + filesystem {filesystem}, + lvgl {lcd} { } void DisplayApp::Start(System::BootErrors error) { @@ -100,6 +99,8 @@ void DisplayApp::Start(System::BootErrors error) { bootError = error; + lvgl.Init(); + if (error == System::BootErrors::TouchController) { LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None); } else { |