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:
parent
ff34cf196e
commit
6f942e20ed
|
@ -60,7 +60,6 @@ namespace {
|
||||||
}
|
}
|
||||||
|
|
||||||
DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
||||||
Components::LittleVgl& lvgl,
|
|
||||||
const Drivers::Cst816S& touchPanel,
|
const Drivers::Cst816S& touchPanel,
|
||||||
const Controllers::Battery& batteryController,
|
const Controllers::Battery& batteryController,
|
||||||
const Controllers::Ble& bleController,
|
const Controllers::Ble& bleController,
|
||||||
|
@ -77,7 +76,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
||||||
Pinetime::Controllers::TouchHandler& touchHandler,
|
Pinetime::Controllers::TouchHandler& touchHandler,
|
||||||
Pinetime::Controllers::FS& filesystem)
|
Pinetime::Controllers::FS& filesystem)
|
||||||
: lcd {lcd},
|
: lcd {lcd},
|
||||||
lvgl {lvgl},
|
|
||||||
touchPanel {touchPanel},
|
touchPanel {touchPanel},
|
||||||
batteryController {batteryController},
|
batteryController {batteryController},
|
||||||
bleController {bleController},
|
bleController {bleController},
|
||||||
|
@ -92,7 +90,8 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
||||||
alarmController {alarmController},
|
alarmController {alarmController},
|
||||||
brightnessController {brightnessController},
|
brightnessController {brightnessController},
|
||||||
touchHandler {touchHandler},
|
touchHandler {touchHandler},
|
||||||
filesystem {filesystem} {
|
filesystem {filesystem},
|
||||||
|
lvgl {lcd} {
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayApp::Start(System::BootErrors error) {
|
void DisplayApp::Start(System::BootErrors error) {
|
||||||
|
@ -100,6 +99,8 @@ void DisplayApp::Start(System::BootErrors error) {
|
||||||
|
|
||||||
bootError = error;
|
bootError = error;
|
||||||
|
|
||||||
|
lvgl.Init();
|
||||||
|
|
||||||
if (error == System::BootErrors::TouchController) {
|
if (error == System::BootErrors::TouchController) {
|
||||||
LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None);
|
LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -52,7 +52,6 @@ namespace Pinetime {
|
||||||
enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
|
enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
|
||||||
|
|
||||||
DisplayApp(Drivers::St7789& lcd,
|
DisplayApp(Drivers::St7789& lcd,
|
||||||
Components::LittleVgl& lvgl,
|
|
||||||
const Drivers::Cst816S&,
|
const Drivers::Cst816S&,
|
||||||
const Controllers::Battery& batteryController,
|
const Controllers::Battery& batteryController,
|
||||||
const Controllers::Ble& bleController,
|
const Controllers::Ble& bleController,
|
||||||
|
@ -79,7 +78,6 @@ namespace Pinetime {
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Pinetime::Drivers::St7789& lcd;
|
Pinetime::Drivers::St7789& lcd;
|
||||||
Pinetime::Components::LittleVgl& lvgl;
|
|
||||||
const Pinetime::Drivers::Cst816S& touchPanel;
|
const Pinetime::Drivers::Cst816S& touchPanel;
|
||||||
const Pinetime::Controllers::Battery& batteryController;
|
const Pinetime::Controllers::Battery& batteryController;
|
||||||
const Pinetime::Controllers::Ble& bleController;
|
const Pinetime::Controllers::Ble& bleController;
|
||||||
|
@ -98,6 +96,7 @@ namespace Pinetime {
|
||||||
Pinetime::Controllers::FS& filesystem;
|
Pinetime::Controllers::FS& filesystem;
|
||||||
|
|
||||||
Pinetime::Controllers::FirmwareValidator validator;
|
Pinetime::Controllers::FirmwareValidator validator;
|
||||||
|
Pinetime::Components::LittleVgl lvgl;
|
||||||
|
|
||||||
TaskHandle_t taskHandle;
|
TaskHandle_t taskHandle;
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
using namespace Pinetime::Applications;
|
using namespace Pinetime::Applications;
|
||||||
|
|
||||||
DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
||||||
Components::LittleVgl& /*lvgl*/,
|
|
||||||
const Drivers::Cst816S& /*touchPanel*/,
|
const Drivers::Cst816S& /*touchPanel*/,
|
||||||
const Controllers::Battery& /*batteryController*/,
|
const Controllers::Battery& /*batteryController*/,
|
||||||
const Controllers::Ble& bleController,
|
const Controllers::Ble& bleController,
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "displayapp/TouchEvents.h"
|
#include "displayapp/TouchEvents.h"
|
||||||
#include "displayapp/Apps.h"
|
#include "displayapp/Apps.h"
|
||||||
#include "displayapp/Messages.h"
|
#include "displayapp/Messages.h"
|
||||||
#include "displayapp/DummyLittleVgl.h"
|
|
||||||
|
|
||||||
namespace Pinetime {
|
namespace Pinetime {
|
||||||
namespace Drivers {
|
namespace Drivers {
|
||||||
|
@ -47,7 +46,6 @@ namespace Pinetime {
|
||||||
class DisplayApp {
|
class DisplayApp {
|
||||||
public:
|
public:
|
||||||
DisplayApp(Drivers::St7789& lcd,
|
DisplayApp(Drivers::St7789& lcd,
|
||||||
Components::LittleVgl& lvgl,
|
|
||||||
const Drivers::Cst816S&,
|
const Drivers::Cst816S&,
|
||||||
const Controllers::Battery& batteryController,
|
const Controllers::Battery& batteryController,
|
||||||
const Controllers::Ble& bleController,
|
const Controllers::Ble& bleController,
|
||||||
|
|
|
@ -1,42 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <lvgl/src/lv_core/lv_style.h>
|
|
||||||
#include <lvgl/src/lv_themes/lv_theme.h>
|
|
||||||
#include <lvgl/src/lv_hal/lv_hal.h>
|
|
||||||
#include <drivers/St7789.h>
|
|
||||||
|
|
||||||
namespace Pinetime {
|
|
||||||
namespace Components {
|
|
||||||
class LittleVgl {
|
|
||||||
public:
|
|
||||||
enum class FullRefreshDirections { None, Up, Down };
|
|
||||||
|
|
||||||
LittleVgl(Pinetime::Drivers::St7789& lcd) {
|
|
||||||
}
|
|
||||||
|
|
||||||
LittleVgl(const LittleVgl&) = delete;
|
|
||||||
LittleVgl& operator=(const LittleVgl&) = delete;
|
|
||||||
LittleVgl(LittleVgl&&) = delete;
|
|
||||||
LittleVgl& operator=(LittleVgl&&) = delete;
|
|
||||||
|
|
||||||
void Init() {
|
|
||||||
}
|
|
||||||
|
|
||||||
void FlushDisplay(const lv_area_t* area, lv_color_t* color_p) {
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GetTouchPadInfo(lv_indev_data_t* ptr) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetFullRefresh(FullRefreshDirections direction) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetNewTapEvent(uint16_t x, uint16_t y) {
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetNewTouchPoint(uint16_t x, uint16_t y, bool contact) {
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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::TwiMaster twiMaster {NRF_TWIM1, MaxTwiFrequencyWithoutHardwareBug, Pinetime::PinMap::TwiSda, Pinetime::PinMap::TwiScl};
|
||||||
Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
|
Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
|
||||||
#ifdef PINETIME_IS_RECOVERY
|
#ifdef PINETIME_IS_RECOVERY
|
||||||
#include "displayapp/DummyLittleVgl.h"
|
|
||||||
#include "displayapp/DisplayAppRecovery.h"
|
#include "displayapp/DisplayAppRecovery.h"
|
||||||
#else
|
#else
|
||||||
#include "displayapp/LittleVgl.h"
|
|
||||||
#include "displayapp/DisplayApp.h"
|
#include "displayapp/DisplayApp.h"
|
||||||
#endif
|
#endif
|
||||||
Pinetime::Components::LittleVgl lvgl {lcd};
|
|
||||||
|
|
||||||
Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress};
|
Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress};
|
||||||
Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress};
|
Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress};
|
||||||
|
|
||||||
|
@ -115,7 +111,6 @@ Pinetime::Controllers::ButtonHandler buttonHandler;
|
||||||
Pinetime::Controllers::BrightnessController brightnessController {};
|
Pinetime::Controllers::BrightnessController brightnessController {};
|
||||||
|
|
||||||
Pinetime::Applications::DisplayApp displayApp(lcd,
|
Pinetime::Applications::DisplayApp displayApp(lcd,
|
||||||
lvgl,
|
|
||||||
touchPanel,
|
touchPanel,
|
||||||
batteryController,
|
batteryController,
|
||||||
bleController,
|
bleController,
|
||||||
|
@ -137,7 +132,6 @@ Pinetime::System::SystemTask systemTask(spi,
|
||||||
spiNorFlash,
|
spiNorFlash,
|
||||||
twiMaster,
|
twiMaster,
|
||||||
touchPanel,
|
touchPanel,
|
||||||
lvgl,
|
|
||||||
batteryController,
|
batteryController,
|
||||||
bleController,
|
bleController,
|
||||||
dateTimeController,
|
dateTimeController,
|
||||||
|
@ -350,8 +344,6 @@ int main() {
|
||||||
NoInit_MagicWord = NoInit_MagicValue;
|
NoInit_MagicWord = NoInit_MagicValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
lvgl.Init();
|
|
||||||
|
|
||||||
systemTask.Start();
|
systemTask.Start();
|
||||||
|
|
||||||
nimble_port_init();
|
nimble_port_init();
|
||||||
|
|
|
@ -53,7 +53,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
|
||||||
Pinetime::Drivers::SpiNorFlash& spiNorFlash,
|
Pinetime::Drivers::SpiNorFlash& spiNorFlash,
|
||||||
Drivers::TwiMaster& twiMaster,
|
Drivers::TwiMaster& twiMaster,
|
||||||
Drivers::Cst816S& touchPanel,
|
Drivers::Cst816S& touchPanel,
|
||||||
Components::LittleVgl& lvgl,
|
|
||||||
Controllers::Battery& batteryController,
|
Controllers::Battery& batteryController,
|
||||||
Controllers::Ble& bleController,
|
Controllers::Ble& bleController,
|
||||||
Controllers::DateTime& dateTimeController,
|
Controllers::DateTime& dateTimeController,
|
||||||
|
@ -76,7 +75,6 @@ SystemTask::SystemTask(Drivers::SpiMaster& spi,
|
||||||
spiNorFlash {spiNorFlash},
|
spiNorFlash {spiNorFlash},
|
||||||
twiMaster {twiMaster},
|
twiMaster {twiMaster},
|
||||||
touchPanel {touchPanel},
|
touchPanel {touchPanel},
|
||||||
lvgl {lvgl},
|
|
||||||
batteryController {batteryController},
|
batteryController {batteryController},
|
||||||
bleController {bleController},
|
bleController {bleController},
|
||||||
dateTimeController {dateTimeController},
|
dateTimeController {dateTimeController},
|
||||||
|
|
|
@ -24,11 +24,9 @@
|
||||||
|
|
||||||
#ifdef PINETIME_IS_RECOVERY
|
#ifdef PINETIME_IS_RECOVERY
|
||||||
#include "displayapp/DisplayAppRecovery.h"
|
#include "displayapp/DisplayAppRecovery.h"
|
||||||
#include "displayapp/DummyLittleVgl.h"
|
|
||||||
#else
|
#else
|
||||||
#include "components/settings/Settings.h"
|
#include "components/settings/Settings.h"
|
||||||
#include "displayapp/DisplayApp.h"
|
#include "displayapp/DisplayApp.h"
|
||||||
#include "displayapp/LittleVgl.h"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "drivers/Watchdog.h"
|
#include "drivers/Watchdog.h"
|
||||||
|
@ -61,7 +59,6 @@ namespace Pinetime {
|
||||||
Pinetime::Drivers::SpiNorFlash& spiNorFlash,
|
Pinetime::Drivers::SpiNorFlash& spiNorFlash,
|
||||||
Drivers::TwiMaster& twiMaster,
|
Drivers::TwiMaster& twiMaster,
|
||||||
Drivers::Cst816S& touchPanel,
|
Drivers::Cst816S& touchPanel,
|
||||||
Components::LittleVgl& lvgl,
|
|
||||||
Controllers::Battery& batteryController,
|
Controllers::Battery& batteryController,
|
||||||
Controllers::Ble& bleController,
|
Controllers::Ble& bleController,
|
||||||
Controllers::DateTime& dateTimeController,
|
Controllers::DateTime& dateTimeController,
|
||||||
|
@ -104,7 +101,6 @@ namespace Pinetime {
|
||||||
Pinetime::Drivers::SpiNorFlash& spiNorFlash;
|
Pinetime::Drivers::SpiNorFlash& spiNorFlash;
|
||||||
Pinetime::Drivers::TwiMaster& twiMaster;
|
Pinetime::Drivers::TwiMaster& twiMaster;
|
||||||
Pinetime::Drivers::Cst816S& touchPanel;
|
Pinetime::Drivers::Cst816S& touchPanel;
|
||||||
Pinetime::Components::LittleVgl& lvgl;
|
|
||||||
Pinetime::Controllers::Battery& batteryController;
|
Pinetime::Controllers::Battery& batteryController;
|
||||||
|
|
||||||
Pinetime::Controllers::Ble& bleController;
|
Pinetime::Controllers::Ble& bleController;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user