modules: lvgl: Update gluecode to v9.2

This patch updates the module gluecode to be compatible with LVGL version
9.2. This includes changes done to display and input driver initialization
  and draw buffer handling.

Signed-off-by: Fabian Blatz <[email protected]>

Author: faxe1008

modules/lvgl/Kconfig

@@ -86,7 +86,7 @@ choice LV_COLOR_DEPTH
 endchoice
 
 config LV_COLOR_16_SWAP
-	bool
+	bool "Swap the 2 bytes of RGB565 color."
 
 config LV_Z_FLUSH_THREAD
 	bool "Flush LVGL frames in a separate thread"
@@ -127,10 +127,10 @@ config LV_Z_AREA_Y_ALIGNMENT_WIDTH
 	  the current frame dimensions to meet display and/or LCD host
 	  controller requirements. The value must be power of 2.
 
-config LV_USE_GPU_STM32_DMA2D
+config LV_USE_DRAW_DMA2D
 	bool
 
-config LV_GPU_DMA2D_CMSIS_INCLUDE
+config LV_DRAW_DMA2D_HAL_INCLUDE
 	string
 	help
 	  Must be defined to include path of CMSIS header of target processor

modules/lvgl/include/lv_conf.h

@@ -12,41 +12,31 @@
 
 /* Memory manager settings */
 
-#define LV_MEMCPY_MEMSET_STD 1
-#define LV_MEM_CUSTOM        1
+#define LV_USE_STDLIB_MALLOC LV_STDLIB_CUSTOM
 
 #if defined(CONFIG_LV_Z_MEM_POOL_HEAP_LIB_C)
-
-#define LV_MEM_CUSTOM_INCLUDE "stdlib.h"
-#define LV_MEM_CUSTOM_ALLOC   malloc
-#define LV_MEM_CUSTOM_REALLOC realloc
-#define LV_MEM_CUSTOM_FREE    free
-
+#define LV_STDLIB_INCLUDE "stdlib.h"
+#define lv_malloc_core    malloc
+#define lv_realloc_core   realloc
+#define lv_free_core      free
 #else
-
-#define LV_MEM_CUSTOM_INCLUDE "lvgl_mem.h"
-#define LV_MEM_CUSTOM_ALLOC   lvgl_malloc
-#define LV_MEM_CUSTOM_REALLOC lvgl_realloc
-#define LV_MEM_CUSTOM_FREE    lvgl_free
-
+#define LV_STDLIB_INCLUDE "lvgl_mem.h"
+#define lv_malloc_core    lvgl_malloc
+#define lv_realloc_core   lvgl_realloc
+#define lv_free_core      lvgl_free
 #endif
 
-/* HAL settings */
-
-#define LV_TICK_CUSTOM               1
-#define LV_TICK_CUSTOM_INCLUDE       <zephyr/kernel.h>
-#define LV_TICK_CUSTOM_SYS_TIME_EXPR (k_uptime_get_32())
-
 /* Misc settings */
-
-#define LV_SPRINTF_CUSTOM  1
-#define LV_SPRINTF_INCLUDE "stdio.h"
-#define lv_snprintf        snprintf
-#define lv_vsnprintf       vsnprintf
+#define lv_snprintf  snprintf
+#define lv_vsnprintf vsnprintf
 
 /* Provide definition to align LVGL buffers */
 #define LV_ATTRIBUTE_MEM_ALIGN __aligned(CONFIG_LV_ATTRIBUTE_MEM_ALIGN_SIZE)
 
+#ifdef CONFIG_LV_COLOR_16_SWAP
+#define LV_COLOR_16_SWAP 1
+#endif /* CONFIG_LV_COLOR_16_SWAP */
+
 /*
  * Needed because of a workaround for a GCC bug,
  * see https://github.com/lvgl/lvgl/issues/3078

modules/lvgl/include/lvgl_common_input.h

@@ -20,7 +20,6 @@ struct lvgl_common_input_config {
 };
 
 struct lvgl_common_input_data {
-	lv_indev_drv_t indev_drv;
 	lv_indev_t *indev;
 	lv_indev_data_t pending_event;
 	lv_indev_data_t previous_event;

modules/lvgl/include/lvgl_display.h

@@ -22,35 +22,28 @@ struct lvgl_disp_data {
 };
 
 struct lvgl_display_flush {
-	lv_disp_drv_t *disp_drv;
+	lv_display_t *display;
 	uint16_t x;
 	uint16_t y;
 	struct display_buffer_descriptor desc;
 	void *buf;
 };
 
-void lvgl_flush_cb_mono(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
-void lvgl_flush_cb_16bit(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
-void lvgl_flush_cb_24bit(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
-void lvgl_flush_cb_32bit(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p);
+void lvgl_flush_cb_mono(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
+void lvgl_flush_cb_16bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
+void lvgl_flush_cb_24bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
+void lvgl_flush_cb_32bit(lv_display_t *display, const lv_area_t *area, uint8_t *px_map);
 
-void lvgl_set_px_cb_mono(lv_disp_drv_t *disp_drv, uint8_t *buf, lv_coord_t buf_w, lv_coord_t x,
-			 lv_coord_t y, lv_color_t color, lv_opa_t opa);
-void lvgl_set_px_cb_16bit(lv_disp_drv_t *disp_drv, uint8_t *buf, lv_coord_t buf_w, lv_coord_t x,
-			  lv_coord_t y, lv_color_t color, lv_opa_t opa);
-void lvgl_set_px_cb_24bit(lv_disp_drv_t *disp_drv, uint8_t *buf, lv_coord_t buf_w, lv_coord_t x,
-			  lv_coord_t y, lv_color_t color, lv_opa_t opa);
-void lvgl_set_px_cb_32bit(lv_disp_drv_t *disp_drv, uint8_t *buf, lv_coord_t buf_w, lv_coord_t x,
-			  lv_coord_t y, lv_color_t color, lv_opa_t opa);
+void lvgl_set_px_cb_mono(lv_display_t *display, uint8_t *buf, int32_t buf_w, int32_t x, int32_t y,
+			 lv_color_t color, lv_opa_t opa);
+void lvgl_rounder_cb_mono(lv_event_t *e);
 
-void lvgl_rounder_cb_mono(lv_disp_drv_t *disp_drv, lv_area_t *area);
-
-int set_lvgl_rendering_cb(lv_disp_drv_t *disp_drv);
+int set_lvgl_rendering_cb(lv_display_t *display);
 
 void lvgl_flush_display(struct lvgl_display_flush *request);
 
 #ifdef CONFIG_LV_Z_USE_ROUNDER_CB
-void lvgl_rounder_cb(lv_disp_drv_t *disp_drv, lv_area_t *area);
+void lvgl_rounder_cb(lv_event_t *e);
 #endif
 
 #ifdef __cplusplus

modules/lvgl/include/lvgl_mem.h

@@ -9,6 +9,7 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
+#include <zephyr/sys/mem_stats.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,6 +23,8 @@ void lvgl_free(void *ptr);
 
 void lvgl_print_heap_info(bool dump_chunks);
 
+void lvgl_heap_stats(struct sys_memory_stats *stats);
+
 void lvgl_heap_init(void);
 
 #ifdef __cplusplus

modules/lvgl/input/lvgl_button_input.c

@@ -17,7 +17,7 @@ struct lvgl_button_input_config {
 	struct lvgl_common_input_config common_config; /* Needs to be first member */
 	const uint16_t *input_codes;
 	uint8_t num_codes;
-	const lv_coord_t *coordinates;
+	const int32_t *coordinates;
 };
 
 static void lvgl_button_process_event(struct input_event *evt, void *user_data)
@@ -39,7 +39,7 @@ static void lvgl_button_process_event(struct input_event *evt, void *user_data)
 	}
 
 	data->pending_event.btn_id = i;
-	data->pending_event.state = evt->value ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL;
+	data->pending_event.state = evt->value ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
 
 	if (k_msgq_put(cfg->common_config.event_msgq, &data->pending_event, K_NO_WAIT) != 0) {
 		LOG_WRN("Could not put input data into queue");
@@ -72,8 +72,7 @@ int lvgl_button_input_init(const struct device *dev)
 	LVGL_INPUT_DEFINE(inst, button, CONFIG_LV_Z_BUTTON_INPUT_MSGQ_COUNT,                       \
 			  lvgl_button_process_event);                                              \
 	static const uint16_t lvgl_button_input_codes_##inst[] = DT_INST_PROP(inst, input_codes);  \
-	static const lv_coord_t lvgl_button_coordinates_##inst[] =                                 \
-		DT_INST_PROP(inst, coordinates);                                                   \
+	static const int32_t lvgl_button_coordinates_##inst[] = DT_INST_PROP(inst, coordinates);   \
 	static const struct lvgl_button_input_config lvgl_button_input_config_##inst = {           \
 		.common_config.event_msgq = &LVGL_INPUT_EVENT_MSGQ(inst, button),                  \
 		.input_codes = lvgl_button_input_codes_##inst,                                     \

modules/lvgl/input/lvgl_common_input.c

@@ -23,15 +23,15 @@ lv_indev_t *lvgl_input_get_indev(const struct device *dev)
 	return common_data->indev;
 }
 
-static void lvgl_input_read_cb(lv_indev_drv_t *drv, lv_indev_data_t *data)
+static void lvgl_input_read_cb(lv_indev_t *indev, lv_indev_data_t *data)
 {
-	const struct device *dev = drv->user_data;
+	const struct device *dev = lv_indev_get_user_data(indev);
 	const struct lvgl_common_input_config *cfg = dev->config;
 	struct lvgl_common_input_data *common_data = dev->data;
 
 	if (k_msgq_get(cfg->event_msgq, data, K_NO_WAIT) != 0) {
 		memcpy(data, &common_data->previous_event, sizeof(lv_indev_data_t));
-		if (drv->type == LV_INDEV_TYPE_ENCODER) {
+		if (lv_indev_get_type(indev) == LV_INDEV_TYPE_ENCODER) {
 			data->enc_diff = 0; /* For encoders, clear last movement */
 		}
 		data->continue_reading = false;
@@ -54,16 +54,16 @@ int lvgl_input_register_driver(lv_indev_type_t indev_type, const struct device *
 		return -EINVAL;
 	}
 
-	lv_indev_drv_init(&common_data->indev_drv);
-	common_data->indev_drv.type = indev_type;
-	common_data->indev_drv.read_cb = lvgl_input_read_cb;
-	common_data->indev_drv.user_data = (void *)dev;
-	common_data->indev = lv_indev_drv_register(&common_data->indev_drv);
+	common_data->indev = lv_indev_create();
 
 	if (common_data->indev == NULL) {
 		return -EINVAL;
 	}
 
+	lv_indev_set_type(common_data->indev, indev_type);
+	lv_indev_set_read_cb(common_data->indev, lvgl_input_read_cb);
+	lv_indev_set_user_data(common_data->indev, (void *)dev);
+
 	return 0;
 }
 

modules/lvgl/input/lvgl_encoder_input.c

@@ -28,7 +28,8 @@ static void lvgl_encoder_process_event(struct input_event *evt, void *user_data)
 	if (evt->code == cfg->rotation_input_code) {
 		data->pending_event.enc_diff = evt->value;
 	} else if (evt->code == cfg->button_input_code) {
-		data->pending_event.state = evt->value ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL;
+		data->pending_event.state =
+			evt->value ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
 		data->pending_event.enc_diff = 0;
 		data->pending_event.key = LV_KEY_ENTER;
 	} else {

modules/lvgl/input/lvgl_keypad_input.c

@@ -40,7 +40,7 @@ static void lvgl_keypad_process_event(struct input_event *evt, void *user_data)
 		return;
 	}
 
-	data->pending_event.state = evt->value ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL;
+	data->pending_event.state = evt->value ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
 	if (k_msgq_put(cfg->common_config.event_msgq, &data->pending_event, K_NO_WAIT) != 0) {
 		LOG_WRN("Could not put input data into keypad queue");
 	}

modules/lvgl/input/lvgl_pointer_input.c

@@ -32,8 +32,8 @@ static void lvgl_pointer_process_event(struct input_event *evt, void *user_data)
 	const struct device *dev = user_data;
 	const struct lvgl_pointer_input_config *cfg = dev->config;
 	struct lvgl_pointer_input_data *data = dev->data;
-	lv_disp_t *disp = lv_disp_get_default();
-	struct lvgl_disp_data *disp_data = disp->driver->user_data;
+	lv_display_t *disp = lv_display_get_default();
+	struct lvgl_disp_data *disp_data = (struct lvgl_disp_data *)lv_display_get_user_data(disp);
 	struct display_capabilities *cap = &disp_data->cap;
 	lv_point_t *point = &data->common_data.pending_event.point;
 
@@ -54,7 +54,7 @@ static void lvgl_pointer_process_event(struct input_event *evt, void *user_data)
 		break;
 	case INPUT_BTN_TOUCH:
 		data->common_data.pending_event.state =
-			evt->value ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL;
+			evt->value ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
 		break;
 	}