diff --git a/CHANGELOG.md b/CHANGELOG.md index 87acaa4d7de9..5d587b161089 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file. - IPv6 support in safeboot ### Removed +- LVGL disabled vector graphics ## [13.4.1.1] 20240418 ### Added diff --git a/lib/libesp32_lvgl/lv_binding_berry/generate/LVGL_API_Reference.md b/lib/libesp32_lvgl/lv_binding_berry/generate/LVGL_API_Reference.md index 728714bce822..58093cce8837 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/generate/LVGL_API_Reference.md +++ b/lib/libesp32_lvgl/lv_binding_berry/generate/LVGL_API_Reference.md @@ -77,7 +77,6 @@ draw_line|lv.layer, lv.draw_line_dsc||[lv_draw_line](https://docs.lvgl.io/9.0/se draw_line_dsc_init|lv.draw_line_dsc||[lv_draw_line_dsc_init](https://docs.lvgl.io/9.0/search.html?q=lv_draw_line_dsc_init) draw_rect|lv.layer, lv.draw_rect_dsc, lv.area||[lv_draw_rect](https://docs.lvgl.io/9.0/search.html?q=lv_draw_rect) 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_dsc_get_cb|lv.event_dsc|lv.event_cb|[lv_event_dsc_get_cb](https://docs.lvgl.io/9.0/search.html?q=lv_event_dsc_get_cb) event_dsc_get_user_data|lv.event_dsc|comptr|[lv_event_dsc_get_user_data](https://docs.lvgl.io/9.0/search.html?q=lv_event_dsc_get_user_data) event_register_id||int|[lv_event_register_id](https://docs.lvgl.io/9.0/search.html?q=lv_event_register_id) @@ -156,41 +155,6 @@ timer_get_time_until_next||int|[lv_timer_get_time_until_next](https://docs.lvgl. timer_handler||int|[lv_timer_handler](https://docs.lvgl.io/9.0/search.html?q=lv_timer_handler) timer_handler_run_in_period|int|int|[lv_timer_handler_run_in_period](https://docs.lvgl.io/9.0/search.html?q=lv_timer_handler_run_in_period) timer_periodic_handler|||[lv_timer_periodic_handler](https://docs.lvgl.io/9.0/search.html?q=lv_timer_periodic_handler) -vector_clear_area|comptr, lv.area||[lv_vector_clear_area](https://docs.lvgl.io/9.0/search.html?q=lv_vector_clear_area) -vector_dsc_add_path|comptr, comptr||[lv_vector_dsc_add_path](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_add_path) -vector_dsc_create|lv.layer|comptr|[lv_vector_dsc_create](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_create) -vector_dsc_delete|comptr||[lv_vector_dsc_delete](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_delete) -vector_dsc_identity|comptr||[lv_vector_dsc_identity](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_identity) -vector_dsc_rotate|comptr, f||[lv_vector_dsc_rotate](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_rotate) -vector_dsc_scale|comptr, f, f||[lv_vector_dsc_scale](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_scale) -vector_dsc_set_blend_mode|comptr, int||[lv_vector_dsc_set_blend_mode](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_blend_mode) -vector_dsc_set_fill_color|comptr, lv.color||[lv_vector_dsc_set_fill_color](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_color) -vector_dsc_set_fill_color32|comptr, int||[lv_vector_dsc_set_fill_color32](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_color32) -vector_dsc_set_fill_image|comptr, lv.draw_image_dsc||[lv_vector_dsc_set_fill_image](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_image) -vector_dsc_set_fill_linear_gradient|comptr, lv.grad_dsc, int||[lv_vector_dsc_set_fill_linear_gradient](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_linear_gradient) -vector_dsc_set_fill_opa|comptr, int||[lv_vector_dsc_set_fill_opa](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_opa) -vector_dsc_set_fill_radial_gradient|comptr, lv.grad_dsc, f, f, f, int||[lv_vector_dsc_set_fill_radial_gradient](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_radial_gradient) -vector_dsc_set_fill_rule|comptr, int||[lv_vector_dsc_set_fill_rule](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_fill_rule) -vector_dsc_set_stroke_cap|comptr, int||[lv_vector_dsc_set_stroke_cap](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_cap) -vector_dsc_set_stroke_color|comptr, lv.color||[lv_vector_dsc_set_stroke_color](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_color) -vector_dsc_set_stroke_color32|comptr, int||[lv_vector_dsc_set_stroke_color32](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_color32) -vector_dsc_set_stroke_dash|comptr, lv.float_arr, int||[lv_vector_dsc_set_stroke_dash](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_dash) -vector_dsc_set_stroke_join|comptr, int||[lv_vector_dsc_set_stroke_join](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_join) -vector_dsc_set_stroke_linear_gradient|comptr, lv.grad_dsc, int||[lv_vector_dsc_set_stroke_linear_gradient](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_linear_gradient) -vector_dsc_set_stroke_miter_limit|comptr, int||[lv_vector_dsc_set_stroke_miter_limit](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_miter_limit) -vector_dsc_set_stroke_opa|comptr, int||[lv_vector_dsc_set_stroke_opa](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_opa) -vector_dsc_set_stroke_radial_gradient|comptr, lv.grad_dsc, f, f, f, int||[lv_vector_dsc_set_stroke_radial_gradient](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_radial_gradient) -vector_dsc_set_stroke_width|comptr, f||[lv_vector_dsc_set_stroke_width](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_set_stroke_width) -vector_dsc_skew|comptr, f, f||[lv_vector_dsc_skew](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_skew) -vector_dsc_translate|comptr, f, f||[lv_vector_dsc_translate](https://docs.lvgl.io/9.0/search.html?q=lv_vector_dsc_translate) -vector_path_append_path|comptr, comptr||[lv_vector_path_append_path](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_append_path) -vector_path_append_rect|comptr, lv.area, f, f||[lv_vector_path_append_rect](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_append_rect) -vector_path_clear|comptr||[lv_vector_path_clear](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_clear) -vector_path_close|comptr||[lv_vector_path_close](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_close) -vector_path_copy|comptr, comptr||[lv_vector_path_copy](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_copy) -vector_path_create|int|comptr|[lv_vector_path_create](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_create) -vector_path_delete|comptr||[lv_vector_path_delete](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_delete) -vector_path_get_bounding|comptr, lv.area||[lv_vector_path_get_bounding](https://docs.lvgl.io/9.0/search.html?q=lv_vector_path_get_bounding) version_info||string|[lv_version_info](https://docs.lvgl.io/9.0/search.html?q=lv_version_info) version_major||int|[lv_version_major](https://docs.lvgl.io/9.0/search.html?q=lv_version_major) version_minor||int|[lv_version_minor](https://docs.lvgl.io/9.0/search.html?q=lv_version_minor) diff --git a/lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_module.c b/lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_module.c index d950f337c69c..456c7d06518d 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_module.c +++ b/lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_module.c @@ -99,7 +99,6 @@ const be_ntv_func_def_t lv_func[] = { { "draw_line_dsc_init", { (const void*) &lv_draw_line_dsc_init, "", "(lv.draw_line_dsc)" } }, { "draw_rect", { (const void*) &lv_draw_rect, "", "(lv.layer)(lv.draw_rect_dsc)(lv.area)" } }, { "draw_rect_dsc_init", { (const void*) &lv_draw_rect_dsc_init, "", "(lv.draw_rect_dsc)" } }, - { "draw_vector", { (const void*) &lv_draw_vector, "", "c" } }, { "event_dsc_get_cb", { (const void*) &lv_event_dsc_get_cb, "lv.event_cb", "(lv.event_dsc)" } }, { "event_dsc_get_user_data", { (const void*) &lv_event_dsc_get_user_data, "c", "(lv.event_dsc)" } }, { "event_register_id", { (const void*) &lv_event_register_id, "i", "" } }, @@ -178,41 +177,6 @@ const be_ntv_func_def_t lv_func[] = { { "timer_handler", { (const void*) &lv_timer_handler, "i", "" } }, { "timer_handler_run_in_period", { (const void*) &lv_timer_handler_run_in_period, "i", "i" } }, { "timer_periodic_handler", { (const void*) &lv_timer_periodic_handler, "", "" } }, - { "vector_clear_area", { (const void*) &lv_vector_clear_area, "", "c(lv.area)" } }, - { "vector_dsc_add_path", { (const void*) &lv_vector_dsc_add_path, "", "cc" } }, - { "vector_dsc_create", { (const void*) &lv_vector_dsc_create, "c", "(lv.layer)" } }, - { "vector_dsc_delete", { (const void*) &lv_vector_dsc_delete, "", "c" } }, - { "vector_dsc_identity", { (const void*) &lv_vector_dsc_identity, "", "c" } }, - { "vector_dsc_rotate", { (const void*) &lv_vector_dsc_rotate, "", "cf" } }, - { "vector_dsc_scale", { (const void*) &lv_vector_dsc_scale, "", "cff" } }, - { "vector_dsc_set_blend_mode", { (const void*) &lv_vector_dsc_set_blend_mode, "", "ci" } }, - { "vector_dsc_set_fill_color", { (const void*) &lv_vector_dsc_set_fill_color, "", "c(lv.color)" } }, - { "vector_dsc_set_fill_color32", { (const void*) &lv_vector_dsc_set_fill_color32, "", "ci" } }, - { "vector_dsc_set_fill_image", { (const void*) &lv_vector_dsc_set_fill_image, "", "c(lv.draw_image_dsc)" } }, - { "vector_dsc_set_fill_linear_gradient", { (const void*) &lv_vector_dsc_set_fill_linear_gradient, "", "c(lv.grad_dsc)i" } }, - { "vector_dsc_set_fill_opa", { (const void*) &lv_vector_dsc_set_fill_opa, "", "ci" } }, - { "vector_dsc_set_fill_radial_gradient", { (const void*) &lv_vector_dsc_set_fill_radial_gradient, "", "c(lv.grad_dsc)fffi" } }, - { "vector_dsc_set_fill_rule", { (const void*) &lv_vector_dsc_set_fill_rule, "", "ci" } }, - { "vector_dsc_set_stroke_cap", { (const void*) &lv_vector_dsc_set_stroke_cap, "", "ci" } }, - { "vector_dsc_set_stroke_color", { (const void*) &lv_vector_dsc_set_stroke_color, "", "c(lv.color)" } }, - { "vector_dsc_set_stroke_color32", { (const void*) &lv_vector_dsc_set_stroke_color32, "", "ci" } }, - { "vector_dsc_set_stroke_dash", { (const void*) &lv_vector_dsc_set_stroke_dash, "", "c(lv.float_arr)i" } }, - { "vector_dsc_set_stroke_join", { (const void*) &lv_vector_dsc_set_stroke_join, "", "ci" } }, - { "vector_dsc_set_stroke_linear_gradient", { (const void*) &lv_vector_dsc_set_stroke_linear_gradient, "", "c(lv.grad_dsc)i" } }, - { "vector_dsc_set_stroke_miter_limit", { (const void*) &lv_vector_dsc_set_stroke_miter_limit, "", "ci" } }, - { "vector_dsc_set_stroke_opa", { (const void*) &lv_vector_dsc_set_stroke_opa, "", "ci" } }, - { "vector_dsc_set_stroke_radial_gradient", { (const void*) &lv_vector_dsc_set_stroke_radial_gradient, "", "c(lv.grad_dsc)fffi" } }, - { "vector_dsc_set_stroke_width", { (const void*) &lv_vector_dsc_set_stroke_width, "", "cf" } }, - { "vector_dsc_skew", { (const void*) &lv_vector_dsc_skew, "", "cff" } }, - { "vector_dsc_translate", { (const void*) &lv_vector_dsc_translate, "", "cff" } }, - { "vector_path_append_path", { (const void*) &lv_vector_path_append_path, "", "cc" } }, - { "vector_path_append_rect", { (const void*) &lv_vector_path_append_rect, "", "c(lv.area)ff" } }, - { "vector_path_clear", { (const void*) &lv_vector_path_clear, "", "c" } }, - { "vector_path_close", { (const void*) &lv_vector_path_close, "", "c" } }, - { "vector_path_copy", { (const void*) &lv_vector_path_copy, "", "cc" } }, - { "vector_path_create", { (const void*) &lv_vector_path_create, "c", "i" } }, - { "vector_path_delete", { (const void*) &lv_vector_path_delete, "", "c" } }, - { "vector_path_get_bounding", { (const void*) &lv_vector_path_get_bounding, "", "c(lv.area)" } }, { "version_info", { (const void*) &lv_version_info, "s", "" } }, { "version_major", { (const void*) &lv_version_major, "i", "" } }, { "version_minor", { (const void*) &lv_version_minor, "i", "" } }, @@ -950,39 +914,6 @@ const be_const_member_t lv0_constants[] = { { "TEXT_FLAG_EXPAND", be_cconst_int(LV_TEXT_FLAG_EXPAND) }, { "TEXT_FLAG_FIT", be_cconst_int(LV_TEXT_FLAG_FIT) }, { "TEXT_FLAG_NONE", be_cconst_int(LV_TEXT_FLAG_NONE) }, - { "VECTOR_BLEND_ADDITIVE", be_cconst_int(LV_VECTOR_BLEND_ADDITIVE) }, - { "VECTOR_BLEND_DST_IN", be_cconst_int(LV_VECTOR_BLEND_DST_IN) }, - { "VECTOR_BLEND_DST_OVER", be_cconst_int(LV_VECTOR_BLEND_DST_OVER) }, - { "VECTOR_BLEND_MULTIPLY", be_cconst_int(LV_VECTOR_BLEND_MULTIPLY) }, - { "VECTOR_BLEND_NONE", be_cconst_int(LV_VECTOR_BLEND_NONE) }, - { "VECTOR_BLEND_SCREEN", be_cconst_int(LV_VECTOR_BLEND_SCREEN) }, - { "VECTOR_BLEND_SRC_IN", be_cconst_int(LV_VECTOR_BLEND_SRC_IN) }, - { "VECTOR_BLEND_SRC_OVER", be_cconst_int(LV_VECTOR_BLEND_SRC_OVER) }, - { "VECTOR_BLEND_SUBTRACTIVE", be_cconst_int(LV_VECTOR_BLEND_SUBTRACTIVE) }, - { "VECTOR_DRAW_STYLE_GRADIENT", be_cconst_int(LV_VECTOR_DRAW_STYLE_GRADIENT) }, - { "VECTOR_DRAW_STYLE_PATTERN", be_cconst_int(LV_VECTOR_DRAW_STYLE_PATTERN) }, - { "VECTOR_DRAW_STYLE_SOLID", be_cconst_int(LV_VECTOR_DRAW_STYLE_SOLID) }, - { "VECTOR_FILL_EVENODD", be_cconst_int(LV_VECTOR_FILL_EVENODD) }, - { "VECTOR_FILL_NONZERO", be_cconst_int(LV_VECTOR_FILL_NONZERO) }, - { "VECTOR_GRADIENT_SPREAD_PAD", be_cconst_int(LV_VECTOR_GRADIENT_SPREAD_PAD) }, - { "VECTOR_GRADIENT_SPREAD_REFLECT", be_cconst_int(LV_VECTOR_GRADIENT_SPREAD_REFLECT) }, - { "VECTOR_GRADIENT_SPREAD_REPEAT", be_cconst_int(LV_VECTOR_GRADIENT_SPREAD_REPEAT) }, - { "VECTOR_GRADIENT_STYLE_LINEAR", be_cconst_int(LV_VECTOR_GRADIENT_STYLE_LINEAR) }, - { "VECTOR_GRADIENT_STYLE_RADIAL", be_cconst_int(LV_VECTOR_GRADIENT_STYLE_RADIAL) }, - { "VECTOR_PATH_OP_CLOSE", be_cconst_int(LV_VECTOR_PATH_OP_CLOSE) }, - { "VECTOR_PATH_OP_CUBIC_TO", be_cconst_int(LV_VECTOR_PATH_OP_CUBIC_TO) }, - { "VECTOR_PATH_OP_LINE_TO", be_cconst_int(LV_VECTOR_PATH_OP_LINE_TO) }, - { "VECTOR_PATH_OP_MOVE_TO", be_cconst_int(LV_VECTOR_PATH_OP_MOVE_TO) }, - { "VECTOR_PATH_OP_QUAD_TO", be_cconst_int(LV_VECTOR_PATH_OP_QUAD_TO) }, - { "VECTOR_PATH_QUALITY_HIGH", be_cconst_int(LV_VECTOR_PATH_QUALITY_HIGH) }, - { "VECTOR_PATH_QUALITY_LOW", be_cconst_int(LV_VECTOR_PATH_QUALITY_LOW) }, - { "VECTOR_PATH_QUALITY_MEDIUM", be_cconst_int(LV_VECTOR_PATH_QUALITY_MEDIUM) }, - { "VECTOR_STROKE_CAP_BUTT", be_cconst_int(LV_VECTOR_STROKE_CAP_BUTT) }, - { "VECTOR_STROKE_CAP_ROUND", be_cconst_int(LV_VECTOR_STROKE_CAP_ROUND) }, - { "VECTOR_STROKE_CAP_SQUARE", be_cconst_int(LV_VECTOR_STROKE_CAP_SQUARE) }, - { "VECTOR_STROKE_JOIN_BEVEL", be_cconst_int(LV_VECTOR_STROKE_JOIN_BEVEL) }, - { "VECTOR_STROKE_JOIN_MITER", be_cconst_int(LV_VECTOR_STROKE_JOIN_MITER) }, - { "VECTOR_STROKE_JOIN_ROUND", be_cconst_int(LV_VECTOR_STROKE_JOIN_ROUND) }, { "ZOOM_NONE", be_cconst_int(LV_SCALE_NONE) }, { "&anim_path_bounce", be_cconst_ptr(&lv_anim_path_bounce) }, { "&anim_path_ease_in", be_cconst_ptr(&lv_anim_path_ease_in) }, diff --git a/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h b/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h index e15db5ff7d85..de79bdd390b3 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h +++ b/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h @@ -335,47 +335,14 @@ LV_STRIDE_AUTO LV_RADIUS_CIRCLE // File: ../../lvgl/src/draw/lv_draw_triangle.h // File: ../../lvgl/src/draw/lv_draw_vector.h -LV_VECTOR_FILL_NONZERO -LV_VECTOR_FILL_EVENODD - -LV_VECTOR_STROKE_CAP_BUTT -LV_VECTOR_STROKE_CAP_SQUARE -LV_VECTOR_STROKE_CAP_ROUND - -LV_VECTOR_STROKE_JOIN_MITER -LV_VECTOR_STROKE_JOIN_BEVEL -LV_VECTOR_STROKE_JOIN_ROUND - -LV_VECTOR_PATH_QUALITY_MEDIUM -LV_VECTOR_PATH_QUALITY_HIGH -LV_VECTOR_PATH_QUALITY_LOW - -LV_VECTOR_BLEND_SRC_OVER -LV_VECTOR_BLEND_SRC_IN -LV_VECTOR_BLEND_DST_OVER -LV_VECTOR_BLEND_DST_IN -LV_VECTOR_BLEND_SCREEN -LV_VECTOR_BLEND_MULTIPLY -LV_VECTOR_BLEND_NONE -LV_VECTOR_BLEND_ADDITIVE -LV_VECTOR_BLEND_SUBTRACTIVE - -LV_VECTOR_PATH_OP_MOVE_TO -LV_VECTOR_PATH_OP_LINE_TO -LV_VECTOR_PATH_OP_QUAD_TO -LV_VECTOR_PATH_OP_CUBIC_TO -LV_VECTOR_PATH_OP_CLOSE - -LV_VECTOR_DRAW_STYLE_SOLID -LV_VECTOR_DRAW_STYLE_PATTERN -LV_VECTOR_DRAW_STYLE_GRADIENT - -LV_VECTOR_GRADIENT_SPREAD_PAD -LV_VECTOR_GRADIENT_SPREAD_REPEAT -LV_VECTOR_GRADIENT_SPREAD_REFLECT - -LV_VECTOR_GRADIENT_STYLE_LINEAR -LV_VECTOR_GRADIENT_STYLE_RADIAL + + + + + + + + // File: ../../lvgl/src/draw/lv_image_decoder.h LV_IMAGE_SRC_VARIABLE diff --git a/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h b/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h index e5d00f9cb4dd..db4df57763d9 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h +++ b/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h @@ -613,61 +613,6 @@ void lv_draw_triangle_dsc_init(lv_draw_triangle_dsc_t * draw_dsc) lv_draw_triangle_dsc_t * lv_draw_task_get_triangle_dsc(lv_draw_task_t * task) void lv_draw_triangle(lv_layer_t * layer, const lv_draw_triangle_dsc_t * draw_dsc) -// ../../lvgl/src/draw/lv_draw_vector.h -void lv_matrix_identity(lv_matrix_t * matrix) -void lv_matrix_translate(lv_matrix_t * matrix, float tx, float ty) -void lv_matrix_scale(lv_matrix_t * matrix, float scale_x, float scale_y) -void lv_matrix_rotate(lv_matrix_t * matrix, float degree) -void lv_matrix_skew(lv_matrix_t * matrix, float skew_x, float skew_y) -void lv_matrix_multiply(lv_matrix_t * matrix, const lv_matrix_t * matrix2) -void lv_matrix_transform_point(const lv_matrix_t * matrix, lv_fpoint_t * point) -void lv_matrix_transform_path(const lv_matrix_t * matrix, lv_vector_path_t * path) -lv_vector_path_t * lv_vector_path_create(lv_vector_path_quality_t quality) -void lv_vector_path_copy(lv_vector_path_t * target_path, const lv_vector_path_t * path) -void lv_vector_path_clear(lv_vector_path_t * path) -void lv_vector_path_delete(lv_vector_path_t * path) -void lv_vector_path_move_to(lv_vector_path_t * path, const lv_fpoint_t * p) -void lv_vector_path_line_to(lv_vector_path_t * path, const lv_fpoint_t * p) -void lv_vector_path_quad_to(lv_vector_path_t * path, const lv_fpoint_t * p1, const lv_fpoint_t * p2) -void lv_vector_path_cubic_to(lv_vector_path_t * path, const lv_fpoint_t * p1, const lv_fpoint_t * p2, const lv_fpoint_t * p3) -void lv_vector_path_close(lv_vector_path_t * path) -void lv_vector_path_get_bounding(const lv_vector_path_t * path, lv_area_t * area) -void lv_vector_path_append_rect(lv_vector_path_t * path, const lv_area_t * rect, float rx, float ry) -void lv_vector_path_append_circle(lv_vector_path_t * path, const lv_fpoint_t * c, float rx, float ry) -void lv_vector_path_append_arc(lv_vector_path_t * path, const lv_fpoint_t * c, float radius, float start_angle, float sweep, bool pie) -void lv_vector_path_append_path(lv_vector_path_t * path, const lv_vector_path_t * subpath) -lv_vector_dsc_t * lv_vector_dsc_create(lv_layer_t * layer) -void lv_vector_dsc_delete(lv_vector_dsc_t * dsc) -void lv_vector_dsc_set_transform(lv_vector_dsc_t * dsc, const lv_matrix_t * matrix) -void lv_vector_dsc_set_blend_mode(lv_vector_dsc_t * dsc, lv_vector_blend_t blend) -void lv_vector_dsc_set_fill_color32(lv_vector_dsc_t * dsc, lv_color32_t color) -void lv_vector_dsc_set_fill_color(lv_vector_dsc_t * dsc, lv_color_t color) -void lv_vector_dsc_set_fill_opa(lv_vector_dsc_t * dsc, lv_opa_t opa) -void lv_vector_dsc_set_fill_rule(lv_vector_dsc_t * dsc, lv_vector_fill_t rule) -void lv_vector_dsc_set_fill_image(lv_vector_dsc_t * dsc, const lv_draw_image_dsc_t * img_dsc) -void lv_vector_dsc_set_fill_linear_gradient(lv_vector_dsc_t * dsc, const lv_grad_dsc_t * grad, lv_vector_gradient_spread_t spread) -void lv_vector_dsc_set_fill_radial_gradient(lv_vector_dsc_t * dsc, const lv_grad_dsc_t * grad, float cx, float cy, float radius, lv_vector_gradient_spread_t spread) -void lv_vector_dsc_set_fill_transform(lv_vector_dsc_t * dsc, const lv_matrix_t * matrix) -void lv_vector_dsc_set_stroke_color32(lv_vector_dsc_t * dsc, lv_color32_t color) -void lv_vector_dsc_set_stroke_color(lv_vector_dsc_t * dsc, lv_color_t color) -void lv_vector_dsc_set_stroke_opa(lv_vector_dsc_t * dsc, lv_opa_t opa) -void lv_vector_dsc_set_stroke_width(lv_vector_dsc_t * dsc, float width) -void lv_vector_dsc_set_stroke_dash(lv_vector_dsc_t * dsc, float * dash_pattern, uint16_t dash_count) -void lv_vector_dsc_set_stroke_cap(lv_vector_dsc_t * dsc, lv_vector_stroke_cap_t cap) -void lv_vector_dsc_set_stroke_join(lv_vector_dsc_t * dsc, lv_vector_stroke_join_t join) -void lv_vector_dsc_set_stroke_miter_limit(lv_vector_dsc_t * dsc, uint16_t miter_limit) -void lv_vector_dsc_set_stroke_linear_gradient(lv_vector_dsc_t * dsc, const lv_grad_dsc_t * grad, lv_vector_gradient_spread_t spread) -void lv_vector_dsc_set_stroke_radial_gradient(lv_vector_dsc_t * dsc, const lv_grad_dsc_t * grad, float cx, float cy, float radius, lv_vector_gradient_spread_t spread) -void lv_vector_dsc_set_stroke_transform(lv_vector_dsc_t * dsc, const lv_matrix_t * matrix) -void lv_vector_dsc_identity(lv_vector_dsc_t * dsc) -void lv_vector_dsc_scale(lv_vector_dsc_t * dsc, float scale_x, float scale_y) -void lv_vector_dsc_rotate(lv_vector_dsc_t * dsc, float degree) -void lv_vector_dsc_translate(lv_vector_dsc_t * dsc, float tx, float ty) -void lv_vector_dsc_skew(lv_vector_dsc_t * dsc, float skew_x, float skew_y) -void lv_vector_dsc_add_path(lv_vector_dsc_t * dsc, const lv_vector_path_t * path) -void lv_vector_clear_area(lv_vector_dsc_t * dsc, const lv_area_t * rect) -void lv_draw_vector(lv_vector_dsc_t * dsc) - // ../../lvgl/src/font/lv_font.h const void * lv_font_get_glyph_bitmap(lv_font_glyph_dsc_t * g_dsc, uint32_t letter, lv_draw_buf_t * draw_buf) bool lv_font_get_glyph_dsc(const lv_font_t * font, lv_font_glyph_dsc_t * dsc_out, uint32_t letter, uint32_t letter_next) diff --git a/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py b/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py index c497b2a8a927..6955a62daeb9 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py +++ b/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py @@ -278,6 +278,8 @@ class type_mapper_class: "lv_style_prop_t []", "lv_calendar_date_t []", "lv_indev_read_cb_t", + "lv_vector_path_t *", + "lv_vector_path_quality_t", ] return_types = { @@ -299,7 +301,7 @@ class type_mapper_class: "constchar *": "s", # special construct # "lv_obj_user_data_t": "i", "lv_result_t": "i", - "float": "f", + # "float": "f", "lv_coord_t": "i", "lv_opa_t": "i", @@ -348,19 +350,19 @@ class type_mapper_class: "lv_scale_mode_t": "i", "lv_span_overflow_t": "i", "lv_span_mode_t": "i", - "lv_vector_path_t *": "c", # treat as opaque pointer - "lv_vector_dsc_t *": "c", # treat as opaque pointer + # "lv_vector_path_t *": "c", # treat as opaque pointer + # "lv_vector_dsc_t *": "c", # treat as opaque pointer "lv_point_t *": "c", # treat as opaque pointer "lv_hit_test_info_t *": "c", # treat as opaque pointer "lv_screen_load_anim_t": "i", "lv_display_render_mode_t": "i", - "lv_vector_gradient_spread_t": "i", + # "lv_vector_gradient_spread_t": "i", "lv_cover_res_t": "i", - "lv_vector_path_quality_t": "i", - "lv_vector_blend_t": "i", - "lv_vector_fill_t": "i", - "lv_vector_stroke_cap_t": "i", - "lv_vector_stroke_join_t": "i", + # "lv_vector_path_quality_t": "i", + # "lv_vector_blend_t": "i", + # "lv_vector_fill_t": "i", + # "lv_vector_stroke_cap_t": "i", + # "lv_vector_stroke_join_t": "i", "lv_font_kerning_t": "i", "lv_menu_mode_header_t": "i", "lv_menu_mode_root_back_button_t": "i", @@ -371,7 +373,7 @@ class type_mapper_class: "int32_t *": "lv_int_arr", "int32_t []": "lv_int_arr", "uint32_t *": "lv_int_arr", - "float *": "lv_float_arr", + # "float *": "lv_float_arr", # layouts "lv_flex_align_t": "i", "lv_flex_flow_t": "i", diff --git a/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py b/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py index b3e998c6886f..a939c296b74d 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py +++ b/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py @@ -64,7 +64,7 @@ def clean_source(raw): "draw/lv_draw_mask.h", "draw/lv_draw_rect.h", "draw/lv_draw_triangle.h", - "draw/lv_draw_vector.h", + # "draw/lv_draw_vector.h", "draw/lv_draw.h", "display/*.h", "misc/lv_anim.h", @@ -381,6 +381,7 @@ def clean_source(raw): for exclude_prefix in ["_", "LV_BIDI_DIR_", "LV_FONT_", "LV_SIGNAL_", "LV_TEMPL_", "LV_TASK_PRIO_", "LV_THEME_", "LV_LRU_", + "LV_VECTOR_", "LV_KEYBOARD_MODE_TEXT_ARABIC"]: if enum_item.startswith(exclude_prefix): exclude = True if exclude: continue diff --git a/tasmota/lvgl_berry/tasmota_lv_conf.h b/tasmota/lvgl_berry/tasmota_lv_conf.h index cdec9bc0894a..7e53749a6d53 100644 --- a/tasmota/lvgl_berry/tasmota_lv_conf.h +++ b/tasmota/lvgl_berry/tasmota_lv_conf.h @@ -784,7 +784,7 @@ #define LV_USE_RLOTTIE 0 /*Enable Vector Graphic APIs*/ -#define LV_USE_VECTOR_GRAPHIC 1 // TASMOTA +#define LV_USE_VECTOR_GRAPHIC 0 /* Enable ThorVG (vector graphics library) from the src/libs folder */ #define LV_USE_THORVG_INTERNAL 0