2 files changed, 7 insertions, 41 deletions
diff --git a/src/ui/include/lvgl_task.hpp b/src/ui/include/lvgl_task.hpp
index ca3fc771..b129e329 100644
--- a/src/ui/include/lvgl_task.hpp
+++ b/src/ui/include/lvgl_task.hpp
@@ -10,8 +10,6 @@
 
 namespace ui {
 
-auto StartLvgl(drivers::DriverCache* drivers,
-               std::atomic<bool>* quit,
-               TaskHandle_t* handle) -> bool;
+auto StartLvgl(drivers::DriverCache* drivers) -> void;
 
 }  // namespace ui
diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp
index 12dfd34e..0e96cd41 100644
--- a/src/ui/lvgl_task.cpp
+++ b/src/ui/lvgl_task.cpp
@@ -23,6 +23,7 @@
 #include "misc/lv_color.h"
 #include "misc/lv_style.h"
 #include "misc/lv_timer.h"
+#include "tasks.hpp"
 #include "widgets/lv_label.h"
 
 #include "display.hpp"
@@ -37,24 +38,13 @@ auto tick_hook(TimerHandle_t xTimer) -> void {
   lv_tick_inc(1);
 }
 
-struct LvglArgs {
-  drivers::DriverCache* drivers;
-  std::atomic<bool>* quit;
-};
-
-void LvglMain(void* voidArgs) {
-  LvglArgs* args = reinterpret_cast<LvglArgs*>(voidArgs);
-  drivers::DriverCache* drivers = args->drivers;
-  std::atomic<bool>* quit = args->quit;
-  delete args;
-
+void LvglMain(drivers::DriverCache* drivers) {
   {
     ESP_LOGI(kTag, "init lvgl");
     lv_init();
 
     // LVGL has been initialised, so we can now start reporting ticks to it.
-    TimerHandle_t tick_timer =
-        xTimerCreate("lv_tick", pdMS_TO_TICKS(1), pdTRUE, NULL, &tick_hook);
+    xTimerCreate("lv_tick", pdMS_TO_TICKS(1), pdTRUE, NULL, &tick_hook);
 
     ESP_LOGI(kTag, "init display");
     std::shared_ptr<drivers::Display> display = drivers->AcquireDisplay();
@@ -72,37 +62,15 @@ void LvglMain(void* voidArgs) {
     lv_obj_center(label);
     lv_scr_load(label);
 
-    while (!quit->load()) {
+    while (1) {
       lv_timer_handler();
       vTaskDelay(pdMS_TO_TICKS(10));
     }
-
-    // TODO(robin? daniel?): De-init the UI stack here.
-    lv_obj_del(label);
-    lv_style_reset(&style);
-
-    xTimerDelete(tick_timer, portMAX_DELAY);
-
-    lv_deinit();
   }
-
-  vTaskDelete(NULL);
 }
 
-static const size_t kLvglStackSize = 8 * 1024;
-static StaticTask_t sLvglTaskBuffer = {};
-static StackType_t sLvglStack[kLvglStackSize] = {0};
-
-auto StartLvgl(drivers::DriverCache* drivers,
-               std::atomic<bool>* quit,
-               TaskHandle_t* handle) -> bool {
-  LvglArgs* args = new LvglArgs();
-  args->drivers = drivers;
-  args->quit = quit;
-
-  return xTaskCreateStaticPinnedToCore(&LvglMain, "LVGL", kLvglStackSize,
-                                       reinterpret_cast<void*>(args), 1,
-                                       sLvglStack, &sLvglTaskBuffer, 1);
+auto StartLvgl(drivers::DriverCache* drivers) -> void {
+  tasks::StartPersistent<tasks::Type::kUi>([=]() { LvglMain(drivers); });
 }
 
 }  // namespace ui