From e58dcf6dc5332c60a346509436f9934d9e3bbfbb Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 12 Jun 2024 18:46:07 +1000 Subject: WIP fix issues introduced by lvgl version bump --- src/drivers/include/drivers/display.hpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/drivers/include') diff --git a/src/drivers/include/drivers/display.hpp b/src/drivers/include/drivers/display.hpp index 6dc78e01..21ca3e2d 100644 --- a/src/drivers/include/drivers/display.hpp +++ b/src/drivers/include/drivers/display.hpp @@ -12,6 +12,7 @@ #include "driver/spi_master.h" #include "lvgl/lvgl.h" +#include "misc/lv_types.h" #include "result.hpp" #include "tasks.hpp" @@ -40,9 +41,7 @@ class Display { auto SetBrightness(uint_fast8_t) -> void; /* Driver callback invoked by LVGL when there is new data to display. */ - void OnLvglFlush(lv_disp_drv_t* disp_drv, - const lv_area_t* area, - lv_color_t* color_map); + void OnLvglFlush(const lv_area_t* area, uint8_t* px_map); // Not copyable or movable. Display(const Display&) = delete; @@ -56,9 +55,7 @@ class Display { bool display_on_; uint_fast8_t brightness_; - lv_disp_draw_buf_t buffers_; - lv_disp_drv_t driver_; - lv_disp_t* display_ = nullptr; + lv_display_t* display_ = nullptr; enum TransactionType { COMMAND = 0, -- cgit v1.2.3