Merge pull request #14187 from s-hadinger/lv_81_layouts

LVGL add layouts

lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h

@@ -46,6 +46,21 @@ const be_ntv_func_def_t lv_style_func[] = {
   { "set_clip_corner", (void*) &lv_style_set_clip_corner, "", "(lv.lv_style)b" },
   { "set_color_filter_dsc", (void*) &lv_style_set_color_filter_dsc, "", "(lv.lv_style)(lv.lv_color_filter_dsc)" },
   { "set_color_filter_opa", (void*) &lv_style_set_color_filter_opa, "", "(lv.lv_style)i" },
+  { "set_flex_cross_place", (void*) &lv_style_set_flex_cross_place, "", "(lv.lv_style)i" },
+  { "set_flex_flow", (void*) &lv_style_set_flex_flow, "", "(lv.lv_style)i" },
+  { "set_flex_grow", (void*) &lv_style_set_flex_grow, "", "(lv.lv_style)i" },
+  { "set_flex_main_place", (void*) &lv_style_set_flex_main_place, "", "(lv.lv_style)i" },
+  { "set_flex_track_place", (void*) &lv_style_set_flex_track_place, "", "(lv.lv_style)i" },
+  { "set_grid_cell_column_pos", (void*) &lv_style_set_grid_cell_column_pos, "", "(lv.lv_style)i" },
+  { "set_grid_cell_column_span", (void*) &lv_style_set_grid_cell_column_span, "", "(lv.lv_style)i" },
+  { "set_grid_cell_row_pos", (void*) &lv_style_set_grid_cell_row_pos, "", "(lv.lv_style)i" },
+  { "set_grid_cell_row_span", (void*) &lv_style_set_grid_cell_row_span, "", "(lv.lv_style)i" },
+  { "set_grid_cell_x_align", (void*) &lv_style_set_grid_cell_x_align, "", "(lv.lv_style)i" },
+  { "set_grid_cell_y_align", (void*) &lv_style_set_grid_cell_y_align, "", "(lv.lv_style)i" },
+  { "set_grid_column_align", (void*) &lv_style_set_grid_column_align, "", "(lv.lv_style)i" },
+  { "set_grid_column_dsc_array", (void*) &lv_style_set_grid_column_dsc_array, "", "(lv.lv_style)i" },
+  { "set_grid_row_align", (void*) &lv_style_set_grid_row_align, "", "(lv.lv_style)i" },
+  { "set_grid_row_dsc_array", (void*) &lv_style_set_grid_row_dsc_array, "", "(lv.lv_style)i" },
   { "set_height", (void*) &lv_style_set_height, "", "(lv.lv_style)i" },
   { "set_img_opa", (void*) &lv_style_set_img_opa, "", "(lv.lv_style)i" },
   { "set_img_recolor", (void*) &lv_style_set_img_recolor, "", "(lv.lv_style)(lv.lv_color)" },
@@ -123,6 +138,7 @@ const be_ntv_func_def_t lv_img_func[] = {
   { "get_offset_x", (void*) &lv_img_get_offset_x, "i", "(lv.lv_obj)" },
   { "get_offset_y", (void*) &lv_img_get_offset_y, "i", "(lv.lv_obj)" },
   { "get_pivot", (void*) &lv_img_get_pivot, "", "(lv.lv_obj)(lv.lv_point)" },
+  { "get_size_mode", (void*) &lv_img_get_size_mode, "i", "(lv.lv_obj)" },
   { "get_src", (void*) &lv_img_get_src, ".", "(lv.lv_obj)" },
   { "get_zoom", (void*) &lv_img_get_zoom, "i", "(lv.lv_obj)" },
   { "set_angle", (void*) &lv_img_set_angle, "", "(lv.lv_obj)i" },
@@ -130,7 +146,7 @@ const be_ntv_func_def_t lv_img_func[] = {
   { "set_offset_x", (void*) &lv_img_set_offset_x, "", "(lv.lv_obj)i" },
   { "set_offset_y", (void*) &lv_img_set_offset_y, "", "(lv.lv_obj)i" },
   { "set_pivot", (void*) &lv_img_set_pivot, "", "(lv.lv_obj)ii" },
-  { "set_size_mode", (void*) &lv_img_set_size_mode, "", "(lv.lv_obj)(lv.lv_img_size_mode)" },
+  { "set_size_mode", (void*) &lv_img_set_size_mode, "", "(lv.lv_obj)i" },
   { "set_src", (void*) &lv_img_set_src, "", "(lv.lv_obj)." },
   { "set_tasmota_logo", (void*) &lv_img_set_tasmota_logo, "", "(lv.lv_obj)" },
   { "set_zoom", (void*) &lv_img_set_zoom, "", "(lv.lv_obj)i" },
@@ -242,6 +258,19 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "get_style_border_width", (void*) &lv_obj_get_style_border_width, "i", "(lv.lv_obj)i" },
   { "get_style_clip_corner", (void*) &lv_obj_get_style_clip_corner, "b", "(lv.lv_obj)i" },
   { "get_style_color_filter_opa", (void*) &lv_obj_get_style_color_filter_opa, "i", "(lv.lv_obj)i" },
+  { "get_style_flex_cross_place", (void*) &lv_obj_get_style_flex_cross_place, "i", "(lv.lv_obj)i" },
+  { "get_style_flex_flow", (void*) &lv_obj_get_style_flex_flow, "i", "(lv.lv_obj)i" },
+  { "get_style_flex_grow", (void*) &lv_obj_get_style_flex_grow, "i", "(lv.lv_obj)i" },
+  { "get_style_flex_main_place", (void*) &lv_obj_get_style_flex_main_place, "i", "(lv.lv_obj)i" },
+  { "get_style_flex_track_place", (void*) &lv_obj_get_style_flex_track_place, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_cell_column_pos", (void*) &lv_obj_get_style_grid_cell_column_pos, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_cell_column_span", (void*) &lv_obj_get_style_grid_cell_column_span, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_cell_row_pos", (void*) &lv_obj_get_style_grid_cell_row_pos, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_cell_row_span", (void*) &lv_obj_get_style_grid_cell_row_span, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_cell_x_align", (void*) &lv_obj_get_style_grid_cell_x_align, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_cell_y_align", (void*) &lv_obj_get_style_grid_cell_y_align, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_column_align", (void*) &lv_obj_get_style_grid_column_align, "i", "(lv.lv_obj)i" },
+  { "get_style_grid_row_align", (void*) &lv_obj_get_style_grid_row_align, "i", "(lv.lv_obj)i" },
   { "get_style_height", (void*) &lv_obj_get_style_height, "i", "(lv.lv_obj)i" },
   { "get_style_img_opa", (void*) &lv_obj_get_style_img_opa, "i", "(lv.lv_obj)i" },
   { "get_style_img_recolor", (void*) &lv_obj_get_style_img_recolor, "lv.lv_color", "(lv.lv_obj)i" },
@@ -350,6 +379,12 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "set_content_height", (void*) &lv_obj_set_content_height, "", "(lv.lv_obj)i" },
   { "set_content_width", (void*) &lv_obj_set_content_width, "", "(lv.lv_obj)i" },
   { "set_ext_click_area", (void*) &lv_obj_set_ext_click_area, "", "(lv.lv_obj)i" },
+  { "set_flex_align", (void*) &lv_obj_set_flex_align, "", "(lv.lv_obj)iii" },
+  { "set_flex_flow", (void*) &lv_obj_set_flex_flow, "", "(lv.lv_obj)i" },
+  { "set_flex_grow", (void*) &lv_obj_set_flex_grow, "", "(lv.lv_obj)i" },
+  { "set_grid_align", (void*) &lv_obj_set_grid_align, "", "(lv.lv_obj)ii" },
+  { "set_grid_cell", (void*) &lv_obj_set_grid_cell, "", "(lv.lv_obj)iiiiii" },
+  { "set_grid_dsc_array", (void*) &lv_obj_set_grid_dsc_array, "", "(lv.lv_obj)ii" },
   { "set_height", (void*) &lv_obj_set_height, "", "(lv.lv_obj)i" },
   { "set_layout", (void*) &lv_obj_set_layout, "", "(lv.lv_obj)i" },
   { "set_local_style_prop", (void*) &lv_obj_set_local_style_prop, "", "(lv.lv_obj)(lv.lv_style_prop)ii" },
@@ -394,6 +429,21 @@ const be_ntv_func_def_t lv_obj_func[] = {
   { "set_style_clip_corner", (void*) &lv_obj_set_style_clip_corner, "", "(lv.lv_obj)bi" },
   { "set_style_color_filter_dsc", (void*) &lv_obj_set_style_color_filter_dsc, "", "(lv.lv_obj)(lv.lv_color_filter_dsc)i" },
   { "set_style_color_filter_opa", (void*) &lv_obj_set_style_color_filter_opa, "", "(lv.lv_obj)ii" },
+  { "set_style_flex_cross_place", (void*) &lv_obj_set_style_flex_cross_place, "", "(lv.lv_obj)ii" },
+  { "set_style_flex_flow", (void*) &lv_obj_set_style_flex_flow, "", "(lv.lv_obj)ii" },
+  { "set_style_flex_grow", (void*) &lv_obj_set_style_flex_grow, "", "(lv.lv_obj)ii" },
+  { "set_style_flex_main_place", (void*) &lv_obj_set_style_flex_main_place, "", "(lv.lv_obj)ii" },
+  { "set_style_flex_track_place", (void*) &lv_obj_set_style_flex_track_place, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_cell_column_pos", (void*) &lv_obj_set_style_grid_cell_column_pos, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_cell_column_span", (void*) &lv_obj_set_style_grid_cell_column_span, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_cell_row_pos", (void*) &lv_obj_set_style_grid_cell_row_pos, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_cell_row_span", (void*) &lv_obj_set_style_grid_cell_row_span, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_cell_x_align", (void*) &lv_obj_set_style_grid_cell_x_align, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_cell_y_align", (void*) &lv_obj_set_style_grid_cell_y_align, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_column_align", (void*) &lv_obj_set_style_grid_column_align, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_column_dsc_array", (void*) &lv_obj_set_style_grid_column_dsc_array, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_row_align", (void*) &lv_obj_set_style_grid_row_align, "", "(lv.lv_obj)ii" },
+  { "set_style_grid_row_dsc_array", (void*) &lv_obj_set_style_grid_row_dsc_array, "", "(lv.lv_obj)ii" },
   { "set_style_height", (void*) &lv_obj_set_style_height, "", "(lv.lv_obj)ii" },
   { "set_style_img_opa", (void*) &lv_obj_set_style_img_opa, "", "(lv.lv_obj)ii" },
   { "set_style_img_recolor", (void*) &lv_obj_set_style_img_recolor, "", "(lv.lv_obj)(lv.lv_color)i" },

lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c

@@ -40,6 +40,8 @@ const be_ntv_func_def_t lv_func[] = {
   { "draw_line_dsc_init", (void*) &lv_draw_line_dsc_init, "", "(lv.lv_draw_line_dsc)" },
   { "draw_mask_add", (void*) &lv_draw_mask_add, "i", ".." },
   { "draw_mask_angle_init", (void*) &lv_draw_mask_angle_init, "", "(lv.lv_draw_mask_angle_param)iiii" },
+  { "draw_mask_apply", (void*) &lv_draw_mask_apply, "i", "(lv.lv_opa)iii" },
+  { "draw_mask_apply_ids", (void*) &lv_draw_mask_apply_ids, "i", "(lv.lv_opa)iii(lv.int16)i" },
   { "draw_mask_fade_init", (void*) &lv_draw_mask_fade_init, "", "(lv.lv_draw_mask_fade_param)(lv.lv_area)iiii" },
   { "draw_mask_free_param", (void*) &lv_draw_mask_free_param, "", "." },
   { "draw_mask_get_cnt", (void*) &lv_draw_mask_get_cnt, "i", "" },
@@ -58,8 +60,11 @@ const be_ntv_func_def_t lv_func[] = {
   { "event_send", (void*) &lv_event_send, "i", "(lv.lv_obj)i." },
   { "event_set_cover_res", (void*) &lv_event_set_cover_res, "", "(lv.lv_event)(lv.lv_cover_res)" },
   { "event_set_ext_draw_size", (void*) &lv_event_set_ext_draw_size, "", "(lv.lv_event)i" },
+  { "flex_init", (void*) &lv_flex_init, "", "" },
   { "get_hor_res", (void*) &lv_get_hor_res, "i", "" },
   { "get_ver_res", (void*) &lv_get_ver_res, "i", "" },
+  { "grid_fr", (void*) &lv_grid_fr, "i", "i" },
+  { "grid_init", (void*) &lv_grid_init, "", "" },
   { "group_get_default", (void*) &lv_group_get_default, "lv.lv_group", "" },
   { "img_src_get_type", (void*) &lv_img_src_get_type, "i", "." },
   { "indev_get_act", (void*) &lv_indev_get_act, "lv.lv_indev", "" },

lib/libesp32_lvgl/lv_berry/generate/be_lvgl_widgets_lib.c

@@ -29,6 +29,21 @@ extern int lvbe_theme_create(bvm *vm);
 
 
 /* `lv_style` external functions definitions */
+extern int lvbe_style_set_flex_flow(bvm *vm);
+extern int lvbe_style_set_flex_main_place(bvm *vm);
+extern int lvbe_style_set_flex_cross_place(bvm *vm);
+extern int lvbe_style_set_flex_track_place(bvm *vm);
+extern int lvbe_style_set_flex_grow(bvm *vm);
+extern int lvbe_style_set_grid_row_dsc_array(bvm *vm);
+extern int lvbe_style_set_grid_column_dsc_array(bvm *vm);
+extern int lvbe_style_set_grid_row_align(bvm *vm);
+extern int lvbe_style_set_grid_column_align(bvm *vm);
+extern int lvbe_style_set_grid_cell_column_pos(bvm *vm);
+extern int lvbe_style_set_grid_cell_column_span(bvm *vm);
+extern int lvbe_style_set_grid_cell_row_pos(bvm *vm);
+extern int lvbe_style_set_grid_cell_row_span(bvm *vm);
+extern int lvbe_style_set_grid_cell_x_align(bvm *vm);
+extern int lvbe_style_set_grid_cell_y_align(bvm *vm);
 extern int lvbe_style_set_width(bvm *vm);
 extern int lvbe_style_set_min_width(bvm *vm);
 extern int lvbe_style_set_max_width(bvm *vm);
@@ -143,6 +158,7 @@ extern int lvbe_img_get_angle(bvm *vm);
 extern int lvbe_img_get_pivot(bvm *vm);
 extern int lvbe_img_get_zoom(bvm *vm);
 extern int lvbe_img_get_antialias(bvm *vm);
+extern int lvbe_img_get_size_mode(bvm *vm);
 
 /* `lv_disp` external functions definitions */
 extern int lvbe_disp_get_scr_act(bvm *vm);
@@ -467,6 +483,40 @@ extern int lvbe_obj_get_child(bvm *vm);
 extern int lvbe_obj_get_child_cnt(bvm *vm);
 extern int lvbe_obj_get_index(bvm *vm);
 extern int lvbe_obj_tree_walk(bvm *vm);
+extern int lvbe_obj_set_flex_flow(bvm *vm);
+extern int lvbe_obj_set_flex_align(bvm *vm);
+extern int lvbe_obj_set_flex_grow(bvm *vm);
+extern int lvbe_obj_set_style_flex_flow(bvm *vm);
+extern int lvbe_obj_set_style_flex_main_place(bvm *vm);
+extern int lvbe_obj_set_style_flex_cross_place(bvm *vm);
+extern int lvbe_obj_set_style_flex_track_place(bvm *vm);
+extern int lvbe_obj_set_style_flex_grow(bvm *vm);
+extern int lvbe_obj_get_style_flex_flow(bvm *vm);
+extern int lvbe_obj_get_style_flex_main_place(bvm *vm);
+extern int lvbe_obj_get_style_flex_cross_place(bvm *vm);
+extern int lvbe_obj_get_style_flex_track_place(bvm *vm);
+extern int lvbe_obj_get_style_flex_grow(bvm *vm);
+extern int lvbe_obj_set_grid_dsc_array(bvm *vm);
+extern int lvbe_obj_set_grid_align(bvm *vm);
+extern int lvbe_obj_set_grid_cell(bvm *vm);
+extern int lvbe_obj_set_style_grid_row_dsc_array(bvm *vm);
+extern int lvbe_obj_set_style_grid_column_dsc_array(bvm *vm);
+extern int lvbe_obj_set_style_grid_row_align(bvm *vm);
+extern int lvbe_obj_set_style_grid_column_align(bvm *vm);
+extern int lvbe_obj_set_style_grid_cell_column_pos(bvm *vm);
+extern int lvbe_obj_set_style_grid_cell_column_span(bvm *vm);
+extern int lvbe_obj_set_style_grid_cell_row_pos(bvm *vm);
+extern int lvbe_obj_set_style_grid_cell_row_span(bvm *vm);
+extern int lvbe_obj_set_style_grid_cell_x_align(bvm *vm);
+extern int lvbe_obj_set_style_grid_cell_y_align(bvm *vm);
+extern int lvbe_obj_get_style_grid_row_align(bvm *vm);
+extern int lvbe_obj_get_style_grid_column_align(bvm *vm);
+extern int lvbe_obj_get_style_grid_cell_column_pos(bvm *vm);
+extern int lvbe_obj_get_style_grid_cell_column_span(bvm *vm);
+extern int lvbe_obj_get_style_grid_cell_row_pos(bvm *vm);
+extern int lvbe_obj_get_style_grid_cell_row_span(bvm *vm);
+extern int lvbe_obj_get_style_grid_cell_x_align(bvm *vm);
+extern int lvbe_obj_get_style_grid_cell_y_align(bvm *vm);
 
 /* `lv_group` external functions definitions */
 extern int lvbe_group_create(bvm *vm);

lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h

@@ -509,6 +509,66 @@ void lv_draw_polygon(const lv_point_t points[], uint16_t point_cnt, const lv_are
 
 // ../../lvgl/src/draw/lv_img_decoder.h
 
+// ../../lvgl/src/extra/layouts/flex/lv_flex.h
+void lv_flex_init(void)
+void lv_obj_set_flex_flow(lv_obj_t * obj, lv_flex_flow_t flow)
+void lv_obj_set_flex_align(lv_obj_t * obj, lv_flex_align_t main_place, lv_flex_align_t cross_place, lv_flex_align_t track_cross_place)
+void lv_obj_set_flex_grow(lv_obj_t * obj, uint8_t grow)
+void lv_style_set_flex_flow(lv_style_t * style, lv_flex_flow_t value)
+void lv_style_set_flex_main_place(lv_style_t * style, lv_flex_align_t value)
+void lv_style_set_flex_cross_place(lv_style_t * style, lv_flex_align_t value)
+void lv_style_set_flex_track_place(lv_style_t * style, lv_flex_align_t value)
+void lv_style_set_flex_grow(lv_style_t * style, uint8_t value)
+void lv_obj_set_style_flex_flow(lv_obj_t * obj, lv_flex_flow_t value, lv_style_selector_t selector)
+void lv_obj_set_style_flex_main_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector)
+void lv_obj_set_style_flex_cross_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector)
+void lv_obj_set_style_flex_track_place(lv_obj_t * obj, lv_flex_align_t value, lv_style_selector_t selector)
+void lv_obj_set_style_flex_grow(lv_obj_t * obj, uint8_t value, lv_style_selector_t selector)
+static inline lv_flex_flow_t lv_obj_get_style_flex_flow(const lv_obj_t * obj, uint32_t part)
+static inline lv_flex_align_t lv_obj_get_style_flex_main_place(const lv_obj_t * obj, uint32_t part)
+static inline lv_flex_align_t lv_obj_get_style_flex_cross_place(const lv_obj_t * obj, uint32_t part)
+static inline lv_flex_align_t lv_obj_get_style_flex_track_place(const lv_obj_t * obj, uint32_t part)
+static inline uint8_t lv_obj_get_style_flex_grow(const lv_obj_t * obj, uint32_t part)
+
+// ../../lvgl/src/extra/layouts/grid/lv_grid.h
+void lv_grid_init(void)
+void lv_obj_set_grid_dsc_array(lv_obj_t * obj, const lv_coord_t col_dsc[], const lv_coord_t row_dsc[])
+void lv_obj_set_grid_align(lv_obj_t * obj, lv_grid_align_t column_align, lv_grid_align_t row_align)
+void lv_obj_set_grid_cell(lv_obj_t * obj, lv_grid_align_t column_align, uint8_t col_pos, uint8_t col_span, lv_grid_align_t row_align, uint8_t row_pos, uint8_t row_span)
+static inline lv_coord_t lv_grid_fr(uint8_t x)
+void lv_style_set_grid_row_dsc_array(lv_style_t * style, const lv_coord_t value[])
+void lv_style_set_grid_column_dsc_array(lv_style_t * style, const lv_coord_t value[])
+void lv_style_set_grid_row_align(lv_style_t * style, lv_grid_align_t value)
+void lv_style_set_grid_column_align(lv_style_t * style, lv_grid_align_t value)
+void lv_style_set_grid_cell_column_pos(lv_style_t * style, lv_coord_t value)
+void lv_style_set_grid_cell_column_span(lv_style_t * style, lv_coord_t value)
+void lv_style_set_grid_cell_row_pos(lv_style_t * style, lv_coord_t value)
+void lv_style_set_grid_cell_row_span(lv_style_t * style, lv_coord_t value)
+void lv_style_set_grid_cell_x_align(lv_style_t * style, lv_coord_t value)
+void lv_style_set_grid_cell_y_align(lv_style_t * style, lv_coord_t value)
+void lv_obj_set_style_grid_row_dsc_array(lv_obj_t * obj, const lv_coord_t value[], lv_style_selector_t selector)
+void lv_obj_set_style_grid_column_dsc_array(lv_obj_t * obj, const lv_coord_t value[], lv_style_selector_t selector)
+void lv_obj_set_style_grid_row_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_column_align(lv_obj_t * obj, lv_grid_align_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_cell_column_pos(lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_cell_column_span(lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_cell_row_pos(lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_cell_row_span(lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_cell_x_align(lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+void lv_obj_set_style_grid_cell_y_align(lv_obj_t * obj, lv_coord_t value, lv_style_selector_t selector)
+static inline const lv_coord_t * lv_obj_get_style_grid_row_dsc_array(const lv_obj_t * obj, uint32_t part)
+static inline const lv_coord_t * lv_obj_get_style_grid_column_dsc_array(const lv_obj_t * obj, uint32_t part)
+static inline lv_grid_align_t lv_obj_get_style_grid_row_align(const lv_obj_t * obj, uint32_t part)
+static inline lv_grid_align_t lv_obj_get_style_grid_column_align(const lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_grid_cell_column_pos(const lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_grid_cell_column_span(const lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_grid_cell_row_pos(const lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_grid_cell_row_span(const lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_grid_cell_x_align(const lv_obj_t * obj, uint32_t part)
+static inline lv_coord_t lv_obj_get_style_grid_cell_y_align(const lv_obj_t * obj, uint32_t part)
+
+// ../../lvgl/src/extra/layouts/lv_layouts.h
+
 // ../../lvgl/src/extra/themes/default/lv_theme_default.h
 lv_theme_t * lv_theme_default_init(lv_disp_t * disp, lv_color_t color_primary, lv_color_t color_secondary, bool dark, const lv_font_t * font)
 lv_theme_t * lv_theme_default_get(void)

lib/libesp32_lvgl/lv_berry/tools/convert.py

@@ -98,6 +98,12 @@ return_types = {
   "lv_colorwheel_mode_t": "i",
   "lv_scr_load_anim_t": "i",
   "lv_style_selector_t": "i",
+  "lv_draw_mask_res_t": "i",
+  "lv_img_size_mode_t": "i",
+  # layouts
+  "lv_flex_align_t": "i",
+  "lv_flex_flow_t": "i",
+  "lv_grid_align_t": "i",
 
   "_lv_event_dsc_t *": "i",
 

lib/libesp32_lvgl/lv_berry/tools/preprocessor.py

@@ -62,6 +62,7 @@ lv_fun_globs = [
                   "extra/widgets/spinner/*.h",
                   "extra/themes/default/*.h",
                   "extra/themes/mono/*.h",
+                  "extra/layouts/**/*.h",
                   "core/*.h",
                   "draw/*.h",
                   "misc/lv_style_gen.h",