Skip to content

Commit e57ff28

Browse files
committed
Let lvgl control queueTimeout
1 parent 6c02378 commit e57ff28

2 files changed

Lines changed: 4 additions & 22 deletions

File tree

src/displayapp/DisplayApp.cpp

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -141,29 +141,23 @@ uint32_t count = 0;
141141
bool toggle = true;
142142
void DisplayApp::Refresh() {
143143
TickType_t queueTimeout;
144-
TickType_t delta;
145144
switch (state) {
146145
case States::Idle:
147-
IdleState();
148146
queueTimeout = portMAX_DELAY;
149147
break;
150148
case States::Running:
151-
RunningState();
152-
delta = xTaskGetTickCount() - lastWakeTime;
153-
if (delta > LV_DISP_DEF_REFR_PERIOD) {
154-
delta = LV_DISP_DEF_REFR_PERIOD;
149+
if (!currentScreen->IsRunning()) {
150+
LoadApp(returnToApp, returnDirection);
155151
}
156-
queueTimeout = LV_DISP_DEF_REFR_PERIOD - delta;
152+
queueTimeout = lv_task_handler();
157153
break;
158154
default:
159155
queueTimeout = portMAX_DELAY;
160156
break;
161157
}
162158

163159
Messages msg;
164-
bool messageReceived = xQueueReceive(msgQueue, &msg, queueTimeout);
165-
lastWakeTime = xTaskGetTickCount();
166-
if (messageReceived) {
160+
if (xQueueReceive(msgQueue, &msg, queueTimeout)) {
167161
switch (msg) {
168162
case Messages::DimScreen:
169163
// Backup brightness is the brightness to return to after dimming or sleeping
@@ -275,13 +269,6 @@ void DisplayApp::Refresh() {
275269
}
276270
}
277271

278-
void DisplayApp::RunningState() {
279-
if (!currentScreen->IsRunning()) {
280-
LoadApp(returnToApp, returnDirection);
281-
}
282-
lv_task_handler();
283-
}
284-
285272
void DisplayApp::StartApp(Apps app, DisplayApp::FullRefreshDirections direction) {
286273
nextApp = app;
287274
nextDirection = direction;
@@ -423,9 +410,6 @@ void DisplayApp::LoadApp(Apps app, DisplayApp::FullRefreshDirections direction)
423410
currentApp = app;
424411
}
425412

426-
void DisplayApp::IdleState() {
427-
}
428-
429413
void DisplayApp::PushMessage(Messages msg) {
430414
if (in_isr()) {
431415
BaseType_t xHigherPriorityTaskWoken;

src/displayapp/DisplayApp.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ namespace Pinetime {
103103
TouchEvents returnTouchEvent = TouchEvents::None;
104104

105105
TouchEvents GetGesture();
106-
void RunningState();
107-
void IdleState();
108106
static void Process(void* instance);
109107
void InitHw();
110108
void Refresh();

0 commit comments

Comments
 (0)