mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LVGL9 restore missing layouts (#20701)

This commit is contained in:
s-hadinger 2024-02-11 02:14:01 -08:00 committed by GitHub
parent 3a44d19e8b
commit 66ff68df78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 98 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
- Matter implement auto-attributes
### Fixed
- LVGL9 restore missing layouts
### Removed

9
lib/libesp32_lvgl/lv_binding_berry/generate/LVGL_API_Reference.md
View File

@ -79,12 +79,15 @@ draw_rect|comptr, lv.draw_rect_dsc, lv.area||[lv_draw_rect](https://docs.lvgl.io
draw_rect_dsc_init|lv.draw_rect_dsc||[lv_draw_rect_dsc_init](https://docs.lvgl.io/9.0/search.html?q=lv_draw_rect_dsc_init)
draw_vector|comptr||[lv_draw_vector](https://docs.lvgl.io/9.0/search.html?q=lv_draw_vector)
event_register_id||int|[lv_event_register_id](https://docs.lvgl.io/9.0/search.html?q=lv_event_register_id)
flex_init|||[lv_flex_init](https://docs.lvgl.io/9.0/search.html?q=lv_flex_init)
font_get_glyph_width|lv.font, int, int|int|[lv_font_get_glyph_width](https://docs.lvgl.io/9.0/search.html?q=lv_font_get_glyph_width)
font_get_line_height|lv.font|int|[lv_font_get_line_height](https://docs.lvgl.io/9.0/search.html?q=lv_font_get_line_height)
font_set_kerning|lv.font, int||[lv_font_set_kerning](https://docs.lvgl.io/9.0/search.html?q=lv_font_set_kerning)
get_hor_res||int|[lv_get_hor_res](https://docs.lvgl.io/9.0/search.html?q=lv_get_hor_res)
get_ts_calibration||lv.ts_calibration|[lv_get_ts_calibration](https://docs.lvgl.io/9.0/search.html?q=lv_get_ts_calibration)
get_ver_res||int|[lv_get_ver_res](https://docs.lvgl.io/9.0/search.html?q=lv_get_ver_res)
grid_fr|int|int|[lv_grid_fr](https://docs.lvgl.io/9.0/search.html?q=lv_grid_fr)
grid_init|||[lv_grid_init](https://docs.lvgl.io/9.0/search.html?q=lv_grid_init)
group_by_index|int|lv.group|[lv_group_by_index](https://docs.lvgl.io/9.0/search.html?q=lv_group_by_index)
group_get_count||int|[lv_group_get_count](https://docs.lvgl.io/9.0/search.html?q=lv_group_get_count)
group_get_default||lv.group|[lv_group_get_default](https://docs.lvgl.io/9.0/search.html?q=lv_group_get_default)
@ -826,6 +829,12 @@ set_align|int||[lv_obj_set_align](https://docs.lvgl.io/9.0/search.html?q=lv_obj_
set_content_height|int||[lv_obj_set_content_height](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_content_height)
set_content_width|int||[lv_obj_set_content_width](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_content_width)
set_ext_click_area|int||[lv_obj_set_ext_click_area](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_ext_click_area)
set_flex_align|int, int, int||[lv_obj_set_flex_align](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_flex_align)
set_flex_flow|int||[lv_obj_set_flex_flow](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_flex_flow)
set_flex_grow|int||[lv_obj_set_flex_grow](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_flex_grow)
set_grid_align|int, int||[lv_obj_set_grid_align](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_grid_align)
set_grid_cell|int, int, int, int, int, int||[lv_obj_set_grid_cell](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_grid_cell)
set_grid_dsc_array|lv.int_arr, lv.int_arr||[lv_obj_set_grid_dsc_array](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_grid_dsc_array)
set_height|int||[lv_obj_set_height](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_height)
set_layout|int||[lv_obj_set_layout](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_layout)
set_local_style_prop|int, int, int||[lv_obj_set_local_style_prop](https://docs.lvgl.io/9.0/search.html?q=lv_obj_set_local_style_prop)

6
lib/libesp32_lvgl/lv_binding_berry/generate/be_lv_c_mapping.h
View File

@ -480,6 +480,12 @@ const be_ntv_func_def_t lv_obj_func[] = {
{ "set_content_height", { (const void*) &lv_obj_set_content_height, "", "(lv.obj)i" } },
{ "set_content_width", { (const void*) &lv_obj_set_content_width, "", "(lv.obj)i" } },
{ "set_ext_click_area", { (const void*) &lv_obj_set_ext_click_area, "", "(lv.obj)i" } },
{ "set_flex_align", { (const void*) &lv_obj_set_flex_align, "", "(lv.obj)iii" } },
{ "set_flex_flow", { (const void*) &lv_obj_set_flex_flow, "", "(lv.obj)i" } },
{ "set_flex_grow", { (const void*) &lv_obj_set_flex_grow, "", "(lv.obj)i" } },
{ "set_grid_align", { (const void*) &lv_obj_set_grid_align, "", "(lv.obj)ii" } },
{ "set_grid_cell", { (const void*) &lv_obj_set_grid_cell, "", "(lv.obj)iiiiii" } },
{ "set_grid_dsc_array", { (const void*) &lv_obj_set_grid_dsc_array, "", "(lv.obj)(lv.int_arr)(lv.int_arr)" } },
{ "set_height", { (const void*) &lv_obj_set_height, "", "(lv.obj)i" } },
{ "set_layout", { (const void*) &lv_obj_set_layout, "", "(lv.obj)i" } },
{ "set_local_style_prop", { (const void*) &lv_obj_set_local_style_prop, "", "(lv.obj)iii" } },

31
lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_module.c
View File

@ -101,12 +101,15 @@ const be_ntv_func_def_t lv_func[] = {
{ "draw_rect_dsc_init", { (const void*) &lv_draw_rect_dsc_init, "", "(lv.draw_rect_dsc)" } },
{ "draw_vector", { (const void*) &lv_draw_vector, "", "c" } },
{ "event_register_id", { (const void*) &lv_event_register_id, "i", "" } },
{ "flex_init", { (const void*) &lv_flex_init, "", "" } },
{ "font_get_glyph_width", { (const void*) &lv_font_get_glyph_width, "i", "(lv.font)ii" } },
{ "font_get_line_height", { (const void*) &lv_font_get_line_height, "i", "(lv.font)" } },
{ "font_set_kerning", { (const void*) &lv_font_set_kerning, "", "(lv.font)i" } },
{ "get_hor_res", { (const void*) &lv_get_hor_res, "i", "" } },
{ "get_ts_calibration", { (const void*) &lv_get_ts_calibration, "lv.ts_calibration", "" } },
{ "get_ver_res", { (const void*) &lv_get_ver_res, "i", "" } },
{ "grid_fr", { (const void*) &lv_grid_fr, "i", "i" } },
{ "grid_init", { (const void*) &lv_grid_init, "", "" } },
{ "group_by_index", { (const void*) &lv_group_by_index, "lv.group", "i" } },
{ "group_get_count", { (const void*) &lv_group_get_count, "i", "" } },
{ "group_get_default", { (const void*) &lv_group_get_default, "lv.group", "" } },
@ -453,6 +456,20 @@ const be_const_member_t lv0_constants[] = {
{ "EVENT_STYLE_CHANGED", be_cconst_int(LV_EVENT_STYLE_CHANGED) },
{ "EVENT_VALUE_CHANGED", be_cconst_int(LV_EVENT_VALUE_CHANGED) },
{ "EVENT_VSYNC", be_cconst_int(LV_EVENT_VSYNC) },
{ "FLEX_ALIGN_CENTER", be_cconst_int(LV_FLEX_ALIGN_CENTER) },
{ "FLEX_ALIGN_END", be_cconst_int(LV_FLEX_ALIGN_END) },
{ "FLEX_ALIGN_SPACE_AROUND", be_cconst_int(LV_FLEX_ALIGN_SPACE_AROUND) },
{ "FLEX_ALIGN_SPACE_BETWEEN", be_cconst_int(LV_FLEX_ALIGN_SPACE_BETWEEN) },
{ "FLEX_ALIGN_SPACE_EVENLY", be_cconst_int(LV_FLEX_ALIGN_SPACE_EVENLY) },
{ "FLEX_ALIGN_START", be_cconst_int(LV_FLEX_ALIGN_START) },
{ "FLEX_FLOW_COLUMN", be_cconst_int(LV_FLEX_FLOW_COLUMN) },
{ "FLEX_FLOW_COLUMN_REVERSE", be_cconst_int(LV_FLEX_FLOW_COLUMN_REVERSE) },
{ "FLEX_FLOW_COLUMN_WRAP", be_cconst_int(LV_FLEX_FLOW_COLUMN_WRAP) },
{ "FLEX_FLOW_COLUMN_WRAP_REVERSE", be_cconst_int(LV_FLEX_FLOW_COLUMN_WRAP_REVERSE) },
{ "FLEX_FLOW_ROW", be_cconst_int(LV_FLEX_FLOW_ROW) },
{ "FLEX_FLOW_ROW_REVERSE", be_cconst_int(LV_FLEX_FLOW_ROW_REVERSE) },
{ "FLEX_FLOW_ROW_WRAP", be_cconst_int(LV_FLEX_FLOW_ROW_WRAP) },
{ "FLEX_FLOW_ROW_WRAP_REVERSE", be_cconst_int(LV_FLEX_FLOW_ROW_WRAP_REVERSE) },
{ "FS_MODE_RD", be_cconst_int(LV_FS_MODE_RD) },
{ "FS_MODE_WR", be_cconst_int(LV_FS_MODE_WR) },
{ "FS_RES_BUSY", be_cconst_int(LV_FS_RES_BUSY) },
@ -477,7 +494,16 @@ const be_const_member_t lv0_constants[] = {
{ "GRAD_DIR_HOR", be_cconst_int(LV_GRAD_DIR_HOR) },
{ "GRAD_DIR_NONE", be_cconst_int(LV_GRAD_DIR_NONE) },
{ "GRAD_DIR_VER", be_cconst_int(LV_GRAD_DIR_VER) },
{ "GRID_ALIGN_CENTER", be_cconst_int(LV_GRID_ALIGN_CENTER) },
{ "GRID_ALIGN_END", be_cconst_int(LV_GRID_ALIGN_END) },
{ "GRID_ALIGN_SPACE_AROUND", be_cconst_int(LV_GRID_ALIGN_SPACE_AROUND) },
{ "GRID_ALIGN_SPACE_BETWEEN", be_cconst_int(LV_GRID_ALIGN_SPACE_BETWEEN) },
{ "GRID_ALIGN_SPACE_EVENLY", be_cconst_int(LV_GRID_ALIGN_SPACE_EVENLY) },
{ "GRID_ALIGN_START", be_cconst_int(LV_GRID_ALIGN_START) },
{ "GRID_ALIGN_STRETCH", be_cconst_int(LV_GRID_ALIGN_STRETCH) },
{ "GRID_CONTENT", be_cconst_int(LV_GRID_CONTENT) },
{ "GRID_FR", be_cconst_int(LV_GRID_FR(0)) },
{ "GRID_TEMPLATE_LAST", be_cconst_int(LV_GRID_TEMPLATE_LAST) },
{ "GROUP_REFOCUS_POLICY_NEXT", be_cconst_int(LV_GROUP_REFOCUS_POLICY_NEXT) },
{ "GROUP_REFOCUS_POLICY_PREV", be_cconst_int(LV_GROUP_REFOCUS_POLICY_PREV) },
{ "IMAGEBUTTON_STATE_CHECKED_DISABLED", be_cconst_int(LV_IMAGEBUTTON_STATE_CHECKED_DISABLED) },
@ -551,8 +577,9 @@ const be_const_member_t lv0_constants[] = {
{ "LAYER_TYPE_NONE", be_cconst_int(LV_LAYER_TYPE_NONE) },
{ "LAYER_TYPE_SIMPLE", be_cconst_int(LV_LAYER_TYPE_SIMPLE) },
{ "LAYER_TYPE_TRANSFORM", be_cconst_int(LV_LAYER_TYPE_TRANSFORM) },
{ ">LAYOUT_FLEX", be_ctype(be_LV_LAYOUT_FLEX) },
{ ">LAYOUT_GRID", be_ctype(be_LV_LAYOUT_GRID) },
{ "LAYOUT_FLEX", be_cconst_int(LV_LAYOUT_FLEX) },
{ "LAYOUT_GRID", be_cconst_int(LV_LAYOUT_GRID) },
{ "LAYOUT_NONE", be_cconst_int(LV_LAYOUT_NONE) },
{ "LOG_LEVEL_ERROR", be_cconst_int(LV_LOG_LEVEL_ERROR) },
{ "LOG_LEVEL_INFO", be_cconst_int(LV_LOG_LEVEL_INFO) },
{ "LOG_LEVEL_NONE", be_cconst_int(LV_LOG_LEVEL_NONE) },

6
lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_widgets_lib.c
View File

@ -493,6 +493,12 @@ extern int lvbe_obj_set_align(bvm *vm);
extern int lvbe_obj_set_content_height(bvm *vm);
extern int lvbe_obj_set_content_width(bvm *vm);
extern int lvbe_obj_set_ext_click_area(bvm *vm);
extern int lvbe_obj_set_flex_align(bvm *vm);
extern int lvbe_obj_set_flex_flow(bvm *vm);
extern int lvbe_obj_set_flex_grow(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_grid_dsc_array(bvm *vm);
extern int lvbe_obj_set_height(bvm *vm);
extern int lvbe_obj_set_layout(bvm *vm);
extern int lvbe_obj_set_local_style_prop(bvm *vm);

32
lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h
View File

@ -402,6 +402,38 @@ LV_IMAGE_SRC_FILE
LV_IMAGE_SRC_SYMBOL
LV_IMAGE_SRC_UNKNOWN
// File: ../../lvgl/src/layouts/flex/lv_flex.h
LV_FLEX_ALIGN_START
LV_FLEX_ALIGN_END
LV_FLEX_ALIGN_CENTER
LV_FLEX_ALIGN_SPACE_EVENLY
LV_FLEX_ALIGN_SPACE_AROUND
LV_FLEX_ALIGN_SPACE_BETWEEN
LV_FLEX_FLOW_ROW
LV_FLEX_FLOW_COLUMN
LV_FLEX_FLOW_ROW_WRAP
LV_FLEX_FLOW_ROW_REVERSE
LV_FLEX_FLOW_ROW_WRAP_REVERSE
LV_FLEX_FLOW_COLUMN_WRAP
LV_FLEX_FLOW_COLUMN_REVERSE
LV_FLEX_FLOW_COLUMN_WRAP_REVERSE
// File: ../../lvgl/src/layouts/grid/lv_grid.h
LV_GRID_ALIGN_START
LV_GRID_ALIGN_CENTER
LV_GRID_ALIGN_END
LV_GRID_ALIGN_STRETCH
LV_GRID_ALIGN_SPACE_EVENLY
LV_GRID_ALIGN_SPACE_AROUND
LV_GRID_ALIGN_SPACE_BETWEEN
LV_GRID_CONTENT
LV_GRID_TEMPLATE_LAST
// File: ../../lvgl/src/layouts/lv_layout.h
LV_LAYOUT_NONE
LV_LAYOUT_FLEX
LV_LAYOUT_GRID
// File: ../../lvgl/src/misc/lv_anim.h
LV_ANIM_OFF
LV_ANIM_ON

13
lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h
View File

@ -700,6 +700,19 @@ bool lv_indev_remove_event(lv_indev_t * indev, uint32_t index)
uint32_t lv_indev_remove_event_cb_with_user_data(lv_indev_t * indev, lv_event_cb_t event_cb, void * user_data)
lv_result_t lv_indev_send_event(lv_indev_t * indev, lv_event_code_t code, void * param)
// ../../lvgl/src/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)
// ../../lvgl/src/layouts/grid/lv_grid.h
void lv_grid_init(void)
void lv_obj_set_grid_dsc_array(lv_obj_t * obj, const int32_t col_dsc[], const int32_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, int32_t col_pos, int32_t col_span, lv_grid_align_t row_align, int32_t row_pos, int32_t row_span)
static inline int32_t lv_grid_fr(uint8_t x)
// ../../lvgl/src/libs/qrcode/lv_qrcode.h
lv_obj_t * lv_qrcode_create(lv_obj_t * parent)
void lv_qrcode_set_size(lv_obj_t * obj, int32_t size)

4
lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py
View File

@ -55,6 +55,7 @@ lv_fun_globs = [
"libs/qrcode/lv_qrcode.h",
"core/*.h",
"indev/lv_indev.h",
"layouts/*/*.h",
# "draw/*.h",
"themes/lv_theme.h",
"draw/lv_draw_arc.h",
@ -184,8 +185,7 @@ lv_fun_globs = [
"misc/*.h",
"widgets/*/*.h",
"display/lv_display.h",
"extra/widgets/**/*.h",
"extra/layouts/**/*.h",
"layouts/**/*.h",
]
headers_names = list_files(lv_src_prefix, lv_fun_globs)