scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Initialise DisplayApp components in DisplayApp context

Browse source
This commit is contained in:
mark9064 2025-01-26 19:23:14 +00:00
parent 343962da5d
commit b3f4831e54
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/displayapp/DisplayApp.cpp
View file

@ -129,15 +129,6 @@ void DisplayApp::Start(System::BootErrors error) {
bootError = error; bootError = error;
lvgl.Init();
motorController.Init();
if (error == System::BootErrors::TouchController) {
LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None);
} else {
LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
}
if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) { if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 800, this, 0, &taskHandle)) {
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM); APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
} }
@ -146,17 +137,25 @@ void DisplayApp::Start(System::BootErrors error) {
void DisplayApp::Process(void* instance) { void DisplayApp::Process(void* instance) {
auto* app = static_cast<DisplayApp*>(instance); auto* app = static_cast<DisplayApp*>(instance);
NRF_LOG_INFO("displayapp task started!"); NRF_LOG_INFO("displayapp task started!");
app->InitHw(); app->Init();
if (app->bootError == System::BootErrors::TouchController) {
app->LoadNewScreen(Apps::Error, DisplayApp::FullRefreshDirections::None);
} else {
app->LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
}
while (true) { while (true) {
app->Refresh(); app->Refresh();
} }
} }
void DisplayApp::InitHw() { void DisplayApp::Init() {
lcd.Init();
motorController.Init();
brightnessController.Init(); brightnessController.Init();
ApplyBrightness(); ApplyBrightness();
lcd.Init(); lvgl.Init();
} }
TickType_t DisplayApp::CalculateSleepTime() { TickType_t DisplayApp::CalculateSleepTime() {

2
src/displayapp/DisplayApp.h
View file

@ -121,7 +121,7 @@ namespace Pinetime {
TouchEvents GetGesture(); TouchEvents GetGesture();
static void Process(void* instance); static void Process(void* instance);
void InitHw(); void Init();
void Refresh(); void Refresh();
void LoadNewScreen(Apps app, DisplayApp::FullRefreshDirections direction); void LoadNewScreen(Apps app, DisplayApp::FullRefreshDirections direction);
void LoadScreen(Apps app, DisplayApp::FullRefreshDirections direction); void LoadScreen(Apps app, DisplayApp::FullRefreshDirections direction);