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
This commit is contained in:
@@ -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 {
|
||||
|
Reference in New Issue
Block a user