Various improvements (#21)

* T-Deck stability and naming improvements

* allow main task to clean itself up

* remove unused includes

* various lvgl improvements

* added docs
This commit is contained in:
Ken Van Hoeylandt
2024-01-27 23:13:17 +01:00
committed by GitHub
parent a2f0399c9f
commit 7a7b31e426
17 changed files with 146 additions and 138 deletions
+32 -30
View File
@@ -1,5 +1,6 @@
#include "lvgl_task.h"
#include "lvgl.h"
#include "lvgl_hal.h"
#include "tactility_core.h"
#include "thread.h"
@@ -18,6 +19,8 @@ static uint32_t task_max_sleep_ms = 10;
static QueueHandle_t task_mutex = NULL;
static bool task_running = false;
static void lvgl_task(TT_UNUSED void* arg);
static bool task_lock(int timeout_ticks) {
assert(task_mutex != NULL);
return xSemaphoreTakeRecursive(task_mutex, timeout_ticks) == pdTRUE;
@@ -34,14 +37,14 @@ static void task_set_running(bool running) {
task_unlock();
}
static bool task_is_running() {
bool lvgl_task_is_running() {
assert(task_lock(configTICK_RATE_HZ / 100));
bool result = task_running;
task_unlock();
return result;
}
static bool lvgl_lock(int timeout_ticks) {
static bool lvgl_lock(uint32_t timeout_ticks) {
assert(lvgl_mutex != NULL);
return xSemaphoreTakeRecursive(lvgl_mutex, timeout_ticks) == pdTRUE;
}
@@ -51,7 +54,15 @@ static void lvgl_unlock() {
xSemaphoreGiveRecursive(lvgl_mutex);
}
static void lvgl_task_init() {
void lvgl_task_interrupt() {
tt_check(lvgl_lock(TtWaitForever));
task_set_running(false); // interrupt task with boolean as flag
lvgl_unlock();
}
void lvgl_task_start() {
TT_LOG_I(TAG, "lvgl task starting");
if (lvgl_mutex == NULL) {
TT_LOG_D(TAG, "init: creating lvgl mutex");
lvgl_mutex = xSemaphoreCreateRecursiveMutex();
@@ -63,31 +74,30 @@ static void lvgl_task_init() {
}
tt_lvgl_sync_set(&lvgl_lock, &lvgl_unlock);
// Create the main app loop, like ESP-IDF
BaseType_t task_result = xTaskCreate(
lvgl_task,
"lvgl",
8192,
NULL,
ThreadPriorityHigh, // Should be higher than main app task
NULL
);
tt_assert(task_result == pdTRUE);
}
static void lvgl_task_deinit() {
if (lvgl_mutex) {
vSemaphoreDelete(lvgl_mutex);
lvgl_mutex = NULL;
}
if (task_mutex) {
vSemaphoreDelete(task_mutex);
task_mutex = NULL;
}
#if LV_ENABLE_GC || !LV_MEM_CUSTOM
lv_deinit();
#endif
}
static void lvgl_task(TT_UNUSED void* arg) {
TT_LOG_I(TAG, "lvgl task started");
void lvgl_task(TT_UNUSED void* arg) {
lvgl_hal_init();
lvgl_task_init();
lv_disp_t* display = lvgl_hal_init();
uint32_t task_delay_ms = task_max_sleep_ms;
task_set_running(true);
while (task_is_running()) {
while (lvgl_task_is_running()) {
if (lvgl_lock(0)) {
task_delay_ms = lv_timer_handler();
lvgl_unlock();
@@ -100,16 +110,8 @@ void lvgl_task(TT_UNUSED void* arg) {
vTaskDelay(pdMS_TO_TICKS(task_delay_ms));
}
lvgl_task_deinit();
lv_disp_remove(display);
vTaskDelete(NULL);
}
bool lvgl_is_ready() {
return task_running;
}
void lvgl_interrupt() {
tt_check(lvgl_lock(TtWaitForever));
task_set_running(false); // interrupt task with boolean as flag
lvgl_unlock();
}