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

Merge pull request #14231 from s-hadinger/lvgl_native_arrays 

LVGL add enums and prepare support for native arrays
This commit is contained in:
s-hadinger 2022-01-01 19:28:54 +01:00 committed by GitHub
parent 51ecfc916d 53bf9cf11f
commit 29124b2194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/libesp32_lvgl/lv_berry/generate/be_lv_c_mapping.h
View File

@ -58,9 +58,9 @@ const be_ntv_func_def_t lv_style_func[] = {
{ "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_column_dsc_array", (void*) &lv_style_set_grid_column_dsc_array, "", "(lv.lv_style)(lv.lv_coord_arr)" },
{ "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_grid_row_dsc_array", (void*) &lv_style_set_grid_row_dsc_array, "", "(lv.lv_style)(lv.lv_coord_arr)" },
{ "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)" },
@ -384,7 +384,7 @@ const be_ntv_func_def_t lv_obj_func[] = {
{ "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_grid_dsc_array", (void*) &lv_obj_set_grid_dsc_array, "", "(lv.lv_obj)(lv.lv_coord_arr)(lv.lv_coord_arr)" },
{ "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" },
@ -441,9 +441,9 @@ const be_ntv_func_def_t lv_obj_func[] = {
{ "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_column_dsc_array", (void*) &lv_obj_set_style_grid_column_dsc_array, "", "(lv.lv_obj)(lv.lv_coord_arr)i" },
{ "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_grid_row_dsc_array", (void*) &lv_obj_set_style_grid_row_dsc_array, "", "(lv.lv_obj)(lv.lv_coord_arr)i" },
{ "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" },
@ -551,7 +551,7 @@ const be_ntv_func_def_t lv_indev_func[] = {
{ "reset", (void*) &lv_indev_reset, "", "(lv.lv_indev)(lv.lv_obj)" },
{ "reset_long_press", (void*) &lv_indev_reset_long_press, "", "(lv.lv_indev)" },
{ "search_obj", (void*) &lv_indev_search_obj, "lv.lv_obj", "(lv.lv_obj)(lv.lv_point)" },
{ "set_button_points", (void*) &lv_indev_set_button_points, "", "(lv.lv_indev)i" },
{ "set_button_points", (void*) &lv_indev_set_button_points, "", "(lv.lv_indev)(lv.lv_point_arr)" },
{ "set_cursor", (void*) &lv_indev_set_cursor, "", "(lv.lv_indev)(lv.lv_obj)" },
{ "set_group", (void*) &lv_indev_set_group, "", "(lv.lv_indev)(lv.lv_group)" },
{ "wait_release", (void*) &lv_indev_wait_release, "", "(lv.lv_indev)" },
@ -579,8 +579,8 @@ const be_ntv_func_def_t lv_chart_func[] = {
{ "set_cursor_point", (void*) &lv_chart_set_cursor_point, "", "(lv.lv_obj)(lv.lv_chart_cursor)(lv.lv_chart_series)i" },
{ "set_cursor_pos", (void*) &lv_chart_set_cursor_pos, "", "(lv.lv_obj)(lv.lv_chart_cursor)(lv.lv_point)" },
{ "set_div_line_count", (void*) &lv_chart_set_div_line_count, "", "(lv.lv_obj)ii" },
{ "set_ext_x_array", (void*) &lv_chart_set_ext_x_array, "", "(lv.lv_obj)(lv.lv_chart_series)i" },
{ "set_ext_y_array", (void*) &lv_chart_set_ext_y_array, "", "(lv.lv_obj)(lv.lv_chart_series)i" },
{ "set_ext_x_array", (void*) &lv_chart_set_ext_x_array, "", "(lv.lv_obj)(lv.lv_chart_series)(lv.lv_coord_arr)" },
{ "set_ext_y_array", (void*) &lv_chart_set_ext_y_array, "", "(lv.lv_obj)(lv.lv_chart_series)(lv.lv_coord_arr)" },
{ "set_next_value", (void*) &lv_chart_set_next_value, "", "(lv.lv_obj)(lv.lv_chart_series)i" },
{ "set_next_value2", (void*) &lv_chart_set_next_value2, "", "(lv.lv_obj)(lv.lv_chart_series)ii" },
{ "set_point_count", (void*) &lv_chart_set_point_count, "", "(lv.lv_obj)i" },
@ -747,7 +747,7 @@ const be_ntv_func_def_t lv_btnmatrix_func[] = {
{ "set_btn_ctrl_all", (void*) &lv_btnmatrix_set_btn_ctrl_all, "", "(lv.lv_obj)(lv.lv_btnmatrix_ctrl)" },
{ "set_btn_width", (void*) &lv_btnmatrix_set_btn_width, "", "(lv.lv_obj)ii" },
{ "set_ctrl_map", (void*) &lv_btnmatrix_set_ctrl_map, "", "(lv.lv_obj)(lv.lv_btnmatrix_ctrl)" },
{ "set_map", (void*) &lv_btnmatrix_set_map, "", "(lv.lv_obj)s" },
{ "set_map", (void*) &lv_btnmatrix_set_map, "", "(lv.lv_obj)(lv.str_arr)" },
{ "set_one_checked", (void*) &lv_btnmatrix_set_one_checked, "", "(lv.lv_obj)b" },
{ "set_selected_btn", (void*) &lv_btnmatrix_set_selected_btn, "", "(lv.lv_obj)i" },
};
@ -761,8 +761,8 @@ const be_ntv_func_def_t lv_canvas_func[] = {
{ "copy_buf", (void*) &lv_canvas_copy_buf, "", "(lv.lv_obj).iiii" },
{ "draw_arc", (void*) &lv_canvas_draw_arc, "", "(lv.lv_obj)iiiii(lv.lv_draw_arc_dsc)" },
{ "draw_img", (void*) &lv_canvas_draw_img, "", "(lv.lv_obj)ii.(lv.lv_draw_img_dsc)" },
{ "draw_line", (void*) &lv_canvas_draw_line, "", "(lv.lv_obj)ii(lv.lv_draw_line_dsc)" },
{ "draw_polygon", (void*) &lv_canvas_draw_polygon, "", "(lv.lv_obj)ii(lv.lv_draw_rect_dsc)" },
{ "draw_line", (void*) &lv_canvas_draw_line, "", "(lv.lv_obj)(lv.lv_point_arr)i(lv.lv_draw_line_dsc)" },
{ "draw_polygon", (void*) &lv_canvas_draw_polygon, "", "(lv.lv_obj)(lv.lv_point_arr)i(lv.lv_draw_rect_dsc)" },
{ "draw_rect", (void*) &lv_canvas_draw_rect, "", "(lv.lv_obj)iiii(lv.lv_draw_rect_dsc)" },
{ "draw_text", (void*) &lv_canvas_draw_text, "", "(lv.lv_obj)iii(lv.lv_draw_label_dsc)s" },
{ "fill_bg", (void*) &lv_canvas_fill_bg, "", "(lv.lv_obj)(lv.lv_color)i" },
@ -838,7 +838,7 @@ const be_ntv_func_def_t lv_label_func[] = {
#ifdef BE_LV_WIDGET_LINE
const be_ntv_func_def_t lv_line_func[] = {
{ "get_y_invert", (void*) &lv_line_get_y_invert, "b", "(lv.lv_obj)" },
{ "set_points", (void*) &lv_line_set_points, "", "(lv.lv_obj)ii" },
{ "set_points", (void*) &lv_line_set_points, "", "(lv.lv_obj)(lv.lv_point_arr)i" },
{ "set_y_invert", (void*) &lv_line_set_y_invert, "", "(lv.lv_obj)b" },
};
#endif // BE_LV_WIDGET_LINE
@ -1087,7 +1087,7 @@ const size_t lv_classes_size = sizeof(lv_classes) / sizeof(lv_classes[0]);
#endif // BE_LV_WIDGET_METER
/* `lv_msgbox` methods */
#ifdef BE_LV_WIDGET_MSGBOX
int be_ntv_lv_msgbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_msgbox_create, "+_p", "(lv.lv_obj)sssb"); }
int be_ntv_lv_msgbox_init(bvm *vm) { return be_call_c_func(vm, (void*) &lv_msgbox_create, "+_p", "(lv.lv_obj)ss(lv.str_arr)b"); }
#endif // BE_LV_WIDGET_MSGBOX
/* `lv_spinbox` methods */
#ifdef BE_LV_WIDGET_SPINBOX

8
lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c
View File

@ -52,10 +52,10 @@ const be_ntv_func_def_t lv_func[] = {
{ "draw_mask_radius_init", (void*) &lv_draw_mask_radius_init, "", "(lv.lv_draw_mask_radius_param)(lv.lv_area)ib" },
{ "draw_mask_remove_custom", (void*) &lv_draw_mask_remove_custom, ".", "." },
{ "draw_mask_remove_id", (void*) &lv_draw_mask_remove_id, ".", "i" },
{ "draw_polygon", (void*) &lv_draw_polygon, "", "ii(lv.lv_area)(lv.lv_draw_rect_dsc)" },
{ "draw_polygon", (void*) &lv_draw_polygon, "", "(lv.lv_point_arr)i(lv.lv_area)(lv.lv_draw_rect_dsc)" },
{ "draw_rect", (void*) &lv_draw_rect, "", "(lv.lv_area)(lv.lv_area)(lv.lv_draw_rect_dsc)" },
{ "draw_rect_dsc_init", (void*) &lv_draw_rect_dsc_init, "", "(lv.lv_draw_rect_dsc)" },
{ "draw_triangle", (void*) &lv_draw_triangle, "", "i(lv.lv_area)(lv.lv_draw_rect_dsc)" },
{ "draw_triangle", (void*) &lv_draw_triangle, "", "(lv.lv_point_arr)(lv.lv_area)(lv.lv_draw_rect_dsc)" },
{ "event_register_id", (void*) &lv_event_register_id, "i", "" },
{ "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)" },
@ -326,6 +326,9 @@ const be_const_member_t lv0_constants[] = {
{ "GRID_ALIGN_SPACE_EVENLY", LV_GRID_ALIGN_SPACE_EVENLY },
{ "GRID_ALIGN_START", LV_GRID_ALIGN_START },
{ "GRID_ALIGN_STRETCH", LV_GRID_ALIGN_STRETCH },
{ "GRID_CONTENT", LV_GRID_CONTENT },
{ "GRID_FR", (int32_t) LV_GRID_FR(0) },
{ "GRID_TEMPLATE_LAST", LV_GRID_TEMPLATE_LAST },
{ "GROUP_REFOCUS_POLICY_NEXT", LV_GROUP_REFOCUS_POLICY_NEXT },
{ "GROUP_REFOCUS_POLICY_PREV", LV_GROUP_REFOCUS_POLICY_PREV },
{ "IMGBTN_STATE_CHECKED_DISABLED", LV_IMGBTN_STATE_CHECKED_DISABLED },
@ -402,6 +405,7 @@ const be_const_member_t lv0_constants[] = {
{ "OBJ_FLAG_CLICKABLE", LV_OBJ_FLAG_CLICKABLE },
{ "OBJ_FLAG_CLICK_FOCUSABLE", LV_OBJ_FLAG_CLICK_FOCUSABLE },
{ "OBJ_FLAG_EVENT_BUBBLE", LV_OBJ_FLAG_EVENT_BUBBLE },
{ "OBJ_FLAG_FLEX_IN_NEW_TRACK", LV_OBJ_FLAG_FLEX_IN_NEW_TRACK },
{ "OBJ_FLAG_FLOATING", LV_OBJ_FLAG_FLOATING },
{ "OBJ_FLAG_GESTURE_BUBBLE", LV_OBJ_FLAG_GESTURE_BUBBLE },
{ "OBJ_FLAG_HIDDEN", LV_OBJ_FLAG_HIDDEN },

6
lib/libesp32_lvgl/lv_berry/mapping/lv_enum.h
View File

@ -34,6 +34,12 @@ LV_STYLE_PROP_ANY
LV_SIZE_CONTENT
LV_GRID_FR=LV_GRID_FR(0)
LV_GRID_CONTENT
LV_GRID_TEMPLATE_LAST
LV_OBJ_FLAG_FLEX_IN_NEW_TRACK
// ======================================================================
// Symbols
// ======================================================================

14
lib/libesp32_lvgl/lv_berry/tools/convert.py
View File

@ -22,7 +22,7 @@ parse_func_def = re.compile("(.*?)\s(\w+)\((.*?)\)")
# parse call argument type
# Ex: 'const lv_obj_t * parent' -> 'const ', 'lv_obj_t', ' * ', 'parent'
# Ex: 'bool auto_fit' -> '', 'bool', ' ', 'auto_fit'
parse_arg = re.compile("(\w+\s+)?(\w+)([\*\s]+)(\w+)")
parse_arg = re.compile("(\w+\s+)?(\w+)([\*\s]+)(\w+)(\[\])?")
return_types = {
"void": "",
@ -107,6 +107,11 @@ return_types = {
"_lv_event_dsc_t *": "i",
# arrays
"char * []": "str_arr",
"lv_coord_t []": "lv_coord_arr",
"lv_point_t []": "lv_point_arr",
# "lv_signal_cb_t": "c",
# "lv_design_cb_t": "c",
# "lv_event_cb_t": "c",
@ -224,15 +229,18 @@ with open(lv_widgets_file) as f:
c_args = ""
args_raw = [ x.strip(" \t\n\r") for x in g.group(3).split(",") ] # split by comma and strip
for arg_raw in args_raw:
# Ex: 'const lv_obj_t * parent' -> 'const ', 'lv_obj_t', ' * ', 'parent'
# Ex: 'bool auto_fit' -> '', 'bool', ' ', 'auto_fit'
# Ex: 'const lv_obj_t * parent' -> 'const ', 'lv_obj_t', ' * ', 'parent', ''
# Ex: 'bool auto_fit' -> '', 'bool', ' ', 'auto_fit', ''
# Ex: 'const lv_coord_t value[]' -> 'const', 'lv_coord_t', '', 'value', '[]'
ga = parse_arg.search(arg_raw)
if ga: # parsing ok?
ga_type = ga.group(2)
ga_ptr = ( ga.group(3).strip(" \t\n\r") == "*" ) # boolean
ga_name = ga.group(4)
ga_array = ga.group(5)
ga_type_ptr = ga_type
if ga_ptr: ga_type_ptr += " *"
if ga_array: ga_type_ptr += " []"
if ga_type_ptr in return_types:
ga_type = return_types[ga_type_ptr]
else:

6
lib/libesp32_lvgl/lv_berry/tools/preprocessor.py
View File

@ -220,6 +220,12 @@ LV_STYLE_PROP_ANY
LV_SIZE_CONTENT
LV_GRID_FR=LV_GRID_FR(0)
LV_GRID_CONTENT
LV_GRID_TEMPLATE_LAST
LV_OBJ_FLAG_FLEX_IN_NEW_TRACK
// ======================================================================
// Symbols
// ======================================================================