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/main.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/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index df8425ca..9611d26c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -81,14 +81,10 @@ static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000}; Pinetime::Drivers::TwiMaster twiMaster {NRF_TWIM1, MaxTwiFrequencyWithoutHardwareBug, Pinetime::PinMap::TwiSda, Pinetime::PinMap::TwiScl}; Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress}; #ifdef PINETIME_IS_RECOVERY - #include "displayapp/DummyLittleVgl.h" #include "displayapp/DisplayAppRecovery.h" #else - #include "displayapp/LittleVgl.h" #include "displayapp/DisplayApp.h" #endif -Pinetime::Components::LittleVgl lvgl {lcd}; - Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress}; Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress}; @@ -115,7 +111,6 @@ Pinetime::Controllers::ButtonHandler buttonHandler; Pinetime::Controllers::BrightnessController brightnessController {}; Pinetime::Applications::DisplayApp displayApp(lcd, - lvgl, touchPanel, batteryController, bleController, @@ -137,7 +132,6 @@ Pinetime::System::SystemTask systemTask(spi, spiNorFlash, twiMaster, touchPanel, - lvgl, batteryController, bleController, dateTimeController, @@ -350,8 +344,6 @@ int main() { NoInit_MagicWord = NoInit_MagicValue; } - lvgl.Init(); - systemTask.Start(); nimble_port_init(); |