summaryrefslogtreecommitdiff
path: root/src/tangara/ui/lvgl_task.cpp
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2024-06-12 18:46:07 +1000
committerjacqueline <me@jacqueline.id.au>2024-06-12 18:46:07 +1000
commite58dcf6dc5332c60a346509436f9934d9e3bbfbb (patch)
treef1b5cf9c7d99739008ff52dbd837c574b2b0ea36 /src/tangara/ui/lvgl_task.cpp
parent64bd9053a25297f7a442ca831c7da5b44bd33f84 (diff)
downloadtangara-fw-e58dcf6dc5332c60a346509436f9934d9e3bbfbb.tar.gz
WIP fix issues introduced by lvgl version bump
Diffstat (limited to 'src/tangara/ui/lvgl_task.cpp')
-rw-r--r--src/tangara/ui/lvgl_task.cpp32
1 files changed, 7 insertions, 25 deletions
diff --git a/src/tangara/ui/lvgl_task.cpp b/src/tangara/ui/lvgl_task.cpp
index 4d12b24b..76274ba9 100644
--- a/src/tangara/ui/lvgl_task.cpp
+++ b/src/tangara/ui/lvgl_task.cpp
@@ -6,45 +6,27 @@
#include "ui/lvgl_task.hpp"
-#include <dirent.h>
-#include <stdint.h>
-#include <stdio.h>
-
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-
-#include "core/lv_disp.h"
#include "core/lv_group.h"
-#include "core/lv_indev.h"
#include "core/lv_obj.h"
#include "core/lv_obj_pos.h"
#include "core/lv_obj_tree.h"
-#include "drivers/touchwheel.hpp"
+#include "core/lv_refr.h"
+#include "display/lv_display.h"
#include "esp_log.h"
-#include "events/event_queue.hpp"
-#include "extra/themes/basic/lv_theme_basic.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/lv_hal_indev.h"
-#include "hal/spi_types.h"
-#include "input/lvgl_input_driver.hpp"
#include "lua.h"
-#include "lv_api_map.h"
#include "lvgl/lvgl.h"
#include "misc/lv_color.h"
#include "misc/lv_style.h"
#include "misc/lv_timer.h"
-#include "tasks.hpp"
-#include "ui/modal.hpp"
-#include "ui/ui_fsm.hpp"
-#include "widgets/lv_label.h"
#include "drivers/display.hpp"
-#include "drivers/gpios.hpp"
+#include "events/event_queue.hpp"
+#include "input/lvgl_input_driver.hpp"
+#include "tasks.hpp"
+#include "ui/ui_fsm.hpp"
namespace ui {
@@ -66,7 +48,7 @@ auto UiTask::Main() -> void {
std::shared_ptr<Screen> screen = UiState::current_screen();
if (screen != current_screen_ && screen != nullptr) {
- lv_scr_load(screen->root());
+ lv_screen_load(screen->root());
if (input_) {
input_->setGroup(screen->group());
}