From cc3fd9571eadf8ad49bd7a5806a504555dc885db Mon Sep 17 00:00:00 2001 From: jacqueline Date: Fri, 21 Apr 2023 10:30:52 +1000 Subject: split out lvgl task into its own component --- src/ui/lvgl_task.cpp | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 src/ui/lvgl_task.cpp (limited to 'src/ui/lvgl_task.cpp') diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp new file mode 100644 index 00000000..d66f6282 --- /dev/null +++ b/src/ui/lvgl_task.cpp @@ -0,0 +1,111 @@ +#include "lvgl_task.hpp" + +#include +#include +#include + +#include +#include +#include + +#include "core/lv_disp.h" +#include "core/lv_obj.h" +#include "core/lv_obj_pos.h" +#include "core/lv_obj_tree.h" +#include "esp_log.h" +#include "font/lv_font.h" +#include "freertos/portmacro.h" +#include "freertos/projdefs.h" +#include "freertos/timers.h" +#include "hal/gpio_types.h" +#include "hal/spi_types.h" +#include "lvgl/lvgl.h" +#include "misc/lv_color.h" +#include "misc/lv_style.h" +#include "misc/lv_timer.h" +#include "widgets/lv_label.h" + +#include "display.hpp" +#include "display_init.hpp" +#include "gpio_expander.hpp" + +namespace ui { + +static const char* kTag = "lv_task"; + +auto tick_hook(TimerHandle_t xTimer) -> void { + lv_tick_inc(1); +} + +struct LvglArgs { + drivers::GpioExpander* gpio_expander; + std::atomic* quit; +}; + +void LvglMain(void* voidArgs) { + LvglArgs* args = (LvglArgs*)voidArgs; + drivers::GpioExpander* gpio_expander = args->gpio_expander; + std::atomic* quit = args->quit; + + // Dispose of the args now that we've gotten everything out of them. + delete args; + + { + 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); + + ESP_LOGI(kTag, "init display"); + std::unique_ptr display = + drivers::Display::create(gpio_expander, drivers::displays::kST7735R); + + lv_style_t style; + lv_style_init(&style); + lv_style_set_text_color(&style, LV_COLOR_MAKE(0xFF, 0, 0)); + // TODO: find a nice bitmap font for this display size and density. + // lv_style_set_text_font(&style, &lv_font_montserrat_24); + + auto label = lv_label_create(NULL); + lv_label_set_text(label, "COLOURS!!"); + lv_obj_add_style(label, &style, 0); + + lv_obj_center(label); + lv_scr_load(label); + + while (!quit->load()) { + 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::GpioExpander* gpios, + std::atomic* quit, + TaskHandle_t* handle) -> bool { + LvglArgs* args = new LvglArgs(); + args->gpio_expander = gpios; + args->quit = quit; + + return xTaskCreateStaticPinnedToCore(&LvglMain, "LVGL", kLvglStackSize, + reinterpret_cast(args), 1, + sLvglStack, &sLvglTaskBuffer, 1); +} + +} // namespace ui -- cgit v1.2.3 From 7083459cf3c62c32d0c039a4665e702d70a27bba Mon Sep 17 00:00:00 2001 From: jacqueline Date: Fri, 21 Apr 2023 15:27:57 +1000 Subject: wrap driver instance ownership + di in a class --- src/ui/lvgl_task.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/ui/lvgl_task.cpp') diff --git a/src/ui/lvgl_task.cpp b/src/ui/lvgl_task.cpp index d66f6282..12dfd34e 100644 --- a/src/ui/lvgl_task.cpp +++ b/src/ui/lvgl_task.cpp @@ -26,7 +26,7 @@ #include "widgets/lv_label.h" #include "display.hpp" -#include "display_init.hpp" +#include "driver_cache.hpp" #include "gpio_expander.hpp" namespace ui { @@ -38,16 +38,14 @@ auto tick_hook(TimerHandle_t xTimer) -> void { } struct LvglArgs { - drivers::GpioExpander* gpio_expander; + drivers::DriverCache* drivers; std::atomic* quit; }; void LvglMain(void* voidArgs) { - LvglArgs* args = (LvglArgs*)voidArgs; - drivers::GpioExpander* gpio_expander = args->gpio_expander; + LvglArgs* args = reinterpret_cast(voidArgs); + drivers::DriverCache* drivers = args->drivers; std::atomic* quit = args->quit; - - // Dispose of the args now that we've gotten everything out of them. delete args; { @@ -59,8 +57,7 @@ void LvglMain(void* voidArgs) { xTimerCreate("lv_tick", pdMS_TO_TICKS(1), pdTRUE, NULL, &tick_hook); ESP_LOGI(kTag, "init display"); - std::unique_ptr display = - drivers::Display::create(gpio_expander, drivers::displays::kST7735R); + std::shared_ptr display = drivers->AcquireDisplay(); lv_style_t style; lv_style_init(&style); @@ -96,11 +93,11 @@ static const size_t kLvglStackSize = 8 * 1024; static StaticTask_t sLvglTaskBuffer = {}; static StackType_t sLvglStack[kLvglStackSize] = {0}; -auto StartLvgl(drivers::GpioExpander* gpios, +auto StartLvgl(drivers::DriverCache* drivers, std::atomic* quit, TaskHandle_t* handle) -> bool { LvglArgs* args = new LvglArgs(); - args->gpio_expander = gpios; + args->drivers = drivers; args->quit = quit; return xTaskCreateStaticPinnedToCore(&LvglMain, "LVGL", kLvglStackSize, -- cgit v1.2.3