From bf47a1e51cb6a8a78f5698ef69802ce12f600e9e Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Sat, 20 Apr 2024 18:57:49 +0200 Subject: [PATCH] LVGL restore `lv_palette` functions (#21232) --- CHANGELOG.md | 1 + .../lv_binding_berry/generate/LVGL_API_Reference.md | 3 +++ lib/libesp32_lvgl/lv_binding_berry/generate/be_lvgl_module.c | 3 +++ lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h | 5 +++++ lib/libesp32_lvgl/lv_binding_berry/tools/convert.py | 1 + lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py | 1 + 6 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7e265a30..c9473518a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,6 +59,7 @@ All notable changes to this project will be documented in this file. - M5Core2 LoRa868 module receive exception - Fade out on CCT bulb with `SO92 1` (#21159) - HASPmota `align` attribute and expand PNG cache +- LVGL restore `lv_palette` functions ### Removed - Unused `#define MQTT_DATA_STRING` support 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 73971358a..728714bce 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 @@ -110,6 +110,9 @@ obj_report_style_change|lv.style||[lv_obj_report_style_change](https://docs.lvgl obj_style_get_selector_part|int|int|[lv_obj_style_get_selector_part](https://docs.lvgl.io/9.0/search.html?q=lv_obj_style_get_selector_part) obj_style_get_selector_state|int|int|[lv_obj_style_get_selector_state](https://docs.lvgl.io/9.0/search.html?q=lv_obj_style_get_selector_state) objid_builtin_destroy|||[lv_objid_builtin_destroy](https://docs.lvgl.io/9.0/search.html?q=lv_objid_builtin_destroy) +palette_darken|int, int|lv.color|[lv_palette_darken](https://docs.lvgl.io/9.0/search.html?q=lv_palette_darken) +palette_lighten|int, int|lv.color|[lv_palette_lighten](https://docs.lvgl.io/9.0/search.html?q=lv_palette_lighten) +palette_main|int|lv.color|[lv_palette_main](https://docs.lvgl.io/9.0/search.html?q=lv_palette_main) pct|int|int|[lv_pct](https://docs.lvgl.io/9.0/search.html?q=lv_pct) pct_to_px|int, int|int|[lv_pct_to_px](https://docs.lvgl.io/9.0/search.html?q=lv_pct_to_px) point_array_transform|comptr, int, int, int, int, comptr, bool||[lv_point_array_transform](https://docs.lvgl.io/9.0/search.html?q=lv_point_array_transform) 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 0b7580025..d950f337c 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 @@ -132,6 +132,9 @@ const be_ntv_func_def_t lv_func[] = { { "obj_style_get_selector_part", { (const void*) &lv_obj_style_get_selector_part, "i", "i" } }, { "obj_style_get_selector_state", { (const void*) &lv_obj_style_get_selector_state, "i", "i" } }, { "objid_builtin_destroy", { (const void*) &lv_objid_builtin_destroy, "", "" } }, + { "palette_darken", { (const void*) &lv_palette_darken, "lv.color", "ii" } }, + { "palette_lighten", { (const void*) &lv_palette_lighten, "lv.color", "ii" } }, + { "palette_main", { (const void*) &lv_palette_main, "lv.color", "i" } }, { "pct", { (const void*) &lv_pct, "i", "i" } }, { "pct_to_px", { (const void*) &lv_pct_to_px, "i", "ii" } }, { "point_array_transform", { (const void*) &lv_point_array_transform, "", "ciiiicb" } }, 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 f0e6f9903..e5d00f9cb 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h +++ b/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_funcs.h @@ -857,6 +857,11 @@ void lv_event_stop_bubbling(lv_event_t * e) void lv_event_stop_processing(lv_event_t * e) uint32_t lv_event_register_id(void) +// ../../lvgl/src/misc/lv_palette.h +lv_color_t lv_palette_main(lv_palette_t p) +lv_color_t lv_palette_lighten(lv_palette_t p, uint8_t lvl) +lv_color_t lv_palette_darken(lv_palette_t p, uint8_t lvl) + // ../../lvgl/src/misc/lv_style.h void lv_style_init(lv_style_t * style) void lv_style_reset(lv_style_t * style) diff --git a/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py b/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py index 76d7c06a3..c497b2a8a 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py +++ b/lib/libesp32_lvgl/lv_binding_berry/tools/convert.py @@ -366,6 +366,7 @@ class type_mapper_class: "lv_menu_mode_root_back_button_t": "i", "lv_point_precise_t []": "lv_point_arr", "lv_obj_point_transform_flag_t": "i", + "lv_palette_t": "i", "int32_t *": "lv_int_arr", "int32_t []": "lv_int_arr", diff --git a/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py b/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py index 5456f392e..b3e998c68 100644 --- a/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py +++ b/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py @@ -71,6 +71,7 @@ lv_fun_globs = [ "misc/lv_area.h", "misc/lv_color.h", "misc/lv_color_op.h", + "misc/lv_palette.h", "misc/lv_event.h", "misc/lv_style_gen.h", "misc/lv_style.h",