diff --git a/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c index b907f6ac9..1bf35be9a 100644 --- a/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c +++ b/lib/libesp32_lvgl/lv_berry/generate/be_lvgl_module.c @@ -29,7 +29,29 @@ const be_ntv_func_def_t lv_func[] = { { "clamp_height", (void*) &lv_clamp_height, "i", "iiii" }, { "clamp_width", (void*) &lv_clamp_width, "i", "iiii" }, + { "color_black", (void*) &lv_color_black, "lv.lv_color", "" }, + { "color_brightness", (void*) &lv_color_brightness, "i", "(lv.lv_color)" }, + { "color_change_lightness", (void*) &lv_color_change_lightness, "lv.lv_color", "(lv.lv_color)i" }, + { "color_chroma_key", (void*) &lv_color_chroma_key, "lv.lv_color", "" }, + { "color_darken", (void*) &lv_color_darken, "lv.lv_color", "(lv.lv_color)i" }, + { "color_fill", (void*) &lv_color_fill, "", "(lv.lv_color)(lv.lv_color)i" }, + { "color_filter_dsc_init", (void*) &lv_color_filter_dsc_init, "", "(lv.lv_color_filter_dsc)^lv_color_filter_cb^" }, + { "color_hex", (void*) &lv_color_hex, "lv.lv_color", "i" }, + { "color_hex3", (void*) &lv_color_hex3, "lv.lv_color", "i" }, + { "color_hsv_to_rgb", (void*) &lv_color_hsv_to_rgb, "lv.lv_color", "iii" }, + { "color_lighten", (void*) &lv_color_lighten, "lv.lv_color", "(lv.lv_color)i" }, + { "color_make", (void*) &lv_color_make, "lv.lv_color", "iii" }, { "color_mix", (void*) &lv_color_mix, "lv.lv_color", "(lv.lv_color)(lv.lv_color)i" }, + { "color_mix_premult", (void*) &lv_color_mix_premult, "lv.lv_color", "(lv.uint16)(lv.lv_color)i" }, + { "color_mix_with_alpha", (void*) &lv_color_mix_with_alpha, "", "(lv.lv_color)i(lv.lv_color)i(lv.lv_color)(lv.lv_opa)" }, + { "color_premult", (void*) &lv_color_premult, "", "(lv.lv_color)i(lv.uint16)" }, + { "color_rgb_to_hsv", (void*) &lv_color_rgb_to_hsv, "i", "iii" }, + { "color_to1", (void*) &lv_color_to1, "i", "(lv.lv_color)" }, + { "color_to16", (void*) &lv_color_to16, "i", "(lv.lv_color)" }, + { "color_to32", (void*) &lv_color_to32, "i", "(lv.lv_color)" }, + { "color_to8", (void*) &lv_color_to8, "i", "(lv.lv_color)" }, + { "color_to_hsv", (void*) &lv_color_to_hsv, "i", "(lv.lv_color)" }, + { "color_white", (void*) &lv_color_white, "lv.lv_color", "" }, { "dpx", (void*) &lv_dpx, "i", "i" }, { "draw_arc", (void*) &lv_draw_arc, "", "iiiii(lv.lv_area)(lv.lv_draw_arc_dsc)" }, { "draw_arc_dsc_init", (void*) &lv_draw_arc_dsc_init, "", "(lv.lv_draw_arc_dsc)" }, @@ -87,6 +109,9 @@ const be_ntv_func_def_t lv_func[] = { { "obj_report_style_change", (void*) &lv_obj_report_style_change, "", "(lv.lv_style)" }, { "obj_style_get_selector_part", (void*) &lv_obj_style_get_selector_part, "i", "i" }, { "obj_style_get_selector_state", (void*) &lv_obj_style_get_selector_state, "i", "i" }, + { "palette_darken", (void*) &lv_palette_darken, "lv.lv_color", "ii" }, + { "palette_lighten", (void*) &lv_palette_lighten, "lv.lv_color", "ii" }, + { "palette_main", (void*) &lv_palette_main, "lv.lv_color", "i" }, { "refr_now", (void*) &lv_refr_now, "", "(lv.lv_disp)" }, { "scr_act", (void*) &lv_scr_act, "lv.lv_obj", "" }, { "scr_load", (void*) &lv_scr_load, "", "(lv.lv_obj)" }, diff --git a/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h b/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h index 173dc3d8e..8f502d65b 100644 --- a/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h +++ b/lib/libesp32_lvgl/lv_berry/mapping/lv_funcs.h @@ -693,6 +693,34 @@ static inline void lv_obj_move_foreground(lv_obj_t * obj) static inline void lv_obj_move_background(lv_obj_t * obj) static inline uint32_t lv_obj_get_child_id(const struct _lv_obj_t * obj) +// ../../lvgl/src/misc/lv_color.h +static inline uint8_t lv_color_to1(lv_color_t color) +static inline uint8_t lv_color_to8(lv_color_t color) +static inline uint16_t lv_color_to16(lv_color_t color) +static inline uint32_t lv_color_to32(lv_color_t color) +static inline lv_color_t lv_color_mix(lv_color_t c1, lv_color_t c2, uint8_t mix) +static inline void lv_color_premult(lv_color_t c, uint8_t mix, uint16_t * out) +static inline lv_color_t lv_color_mix_premult(uint16_t * premult_c1, lv_color_t c2, uint8_t mix) +static inline void lv_color_mix_with_alpha(lv_color_t bg_color, lv_opa_t bg_opa, lv_color_t fg_color, lv_opa_t fg_opa, lv_color_t * res_color, lv_opa_t * res_opa) +static inline uint8_t lv_color_brightness(lv_color_t color) +static inline lv_color_t lv_color_make(uint8_t r, uint8_t g, uint8_t b) +static inline lv_color_t lv_color_hex(uint32_t c) +static inline lv_color_t lv_color_hex3(uint32_t c) +static inline void lv_color_filter_dsc_init(lv_color_filter_dsc_t * dsc, lv_color_filter_cb_t cb) +void lv_color_fill(lv_color_t * buf, lv_color_t color, uint32_t px_num) +lv_color_t lv_color_lighten(lv_color_t c, lv_opa_t lvl) +lv_color_t lv_color_darken(lv_color_t c, lv_opa_t lvl) +lv_color_t lv_color_change_lightness(lv_color_t c, lv_opa_t lvl) +lv_color_t lv_color_hsv_to_rgb(uint16_t h, uint8_t s, uint8_t v) +lv_color_hsv_t lv_color_rgb_to_hsv(uint8_t r8, uint8_t g8, uint8_t b8) +lv_color_hsv_t lv_color_to_hsv(lv_color_t color) +static inline lv_color_t lv_color_chroma_key(void) +lv_color_t lv_palette_main(lv_palette_t p) +static inline lv_color_t lv_color_white(void) +static inline lv_color_t lv_color_black(void) +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_gen.h void lv_style_set_width(lv_style_t * style, lv_coord_t value) void lv_style_set_min_width(lv_style_t * style, lv_coord_t value) diff --git a/lib/libesp32_lvgl/lv_berry/tools/convert.py b/lib/libesp32_lvgl/lv_berry/tools/convert.py index 6c5c1b300..129f0e9b9 100644 --- a/lib/libesp32_lvgl/lv_berry/tools/convert.py +++ b/lib/libesp32_lvgl/lv_berry/tools/convert.py @@ -100,6 +100,7 @@ return_types = { "lv_style_selector_t": "i", "lv_draw_mask_res_t": "i", "lv_img_size_mode_t": "i", + "lv_palette_t": "i", # layouts "lv_flex_align_t": "i", "lv_flex_flow_t": "i", diff --git a/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py b/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py index 5277bbbbd..ff0e2e9aa 100644 --- a/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py +++ b/lib/libesp32_lvgl/lv_berry/tools/preprocessor.py @@ -67,6 +67,7 @@ lv_fun_globs = [ "core/*.h", "draw/*.h", "misc/lv_style_gen.h", + "misc/lv_color.h", #"misc/lv_area.h", #"**/*.h", ]