From aacf3ff2a92122b0fd3281f52b4abdbfe73b083c Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Sat, 4 Sep 2021 11:08:13 +0200 Subject: [PATCH] Lvgl color names (#13056) * LVGL Berry change in color names * Minor fix * Fix --- .../Berry/default/be_lv_lvgl_module.c | 36 +++++++++---------- tools/lv_berry/lv_module.h | 36 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/libesp32/Berry/default/be_lv_lvgl_module.c b/lib/libesp32/Berry/default/be_lv_lvgl_module.c index 7995052de..eb95f38e4 100644 --- a/lib/libesp32/Berry/default/be_lv_lvgl_module.c +++ b/lib/libesp32/Berry/default/be_lv_lvgl_module.c @@ -107,7 +107,6 @@ const be_constint_t lv0_constants[] = { { "ALIGN_OUT_TOP_RIGHT", LV_ALIGN_OUT_TOP_RIGHT }, { "ANIM_OFF", LV_ANIM_OFF }, { "ANIM_ON", LV_ANIM_ON }, - { "AQUA", 65535 }, { "ARC_PART_BG", LV_ARC_PART_BG }, { "ARC_PART_INDIC", LV_ARC_PART_INDIC }, { "ARC_PART_KNOB", LV_ARC_PART_KNOB }, @@ -117,11 +116,9 @@ const be_constint_t lv0_constants[] = { { "BAR_TYPE_CUSTOM", LV_BAR_TYPE_CUSTOM }, { "BAR_TYPE_NORMAL", LV_BAR_TYPE_NORMAL }, { "BAR_TYPE_SYMMETRICAL", LV_BAR_TYPE_SYMMETRICAL }, - { "BLACK", 0 }, { "BLEND_MODE_ADDITIVE", LV_BLEND_MODE_ADDITIVE }, { "BLEND_MODE_NORMAL", LV_BLEND_MODE_NORMAL }, { "BLEND_MODE_SUBTRACTIVE", LV_BLEND_MODE_SUBTRACTIVE }, - { "BLUE", 255 }, { "BORDER_SIDE_BOTTOM", LV_BORDER_SIDE_BOTTOM }, { "BORDER_SIDE_FULL", LV_BORDER_SIDE_FULL }, { "BORDER_SIDE_INTERNAL", LV_BORDER_SIDE_INTERNAL }, @@ -166,6 +163,23 @@ const be_constint_t lv0_constants[] = { { "CHART_UPDATE_MODE_SHIFT", LV_CHART_UPDATE_MODE_SHIFT }, { "CHECKBOX_PART_BG", LV_CHECKBOX_PART_BG }, { "CHECKBOX_PART_BULLET", LV_CHECKBOX_PART_BULLET }, + { "COLOR_AQUA", 65535 }, + { "COLOR_BLACK", 0 }, + { "COLOR_BLUE", 255 }, + { "COLOR_CYAN", 65535 }, + { "COLOR_GRAY", 8421504 }, + { "COLOR_GREEN", 32768 }, + { "COLOR_LIME", 65280 }, + { "COLOR_MAGENTA", 16711935 }, + { "COLOR_MAROON", 8388608 }, + { "COLOR_NAVY", 128 }, + { "COLOR_OLIVE", 8421376 }, + { "COLOR_PURPLE", 8388736 }, + { "COLOR_RED", 16711680 }, + { "COLOR_SILVER", 12632256 }, + { "COLOR_TEAL", 32896 }, + { "COLOR_WHITE", 16777215 }, + { "COLOR_YELLOW", 16776960 }, { "CPICKER_COLOR_MODE_HUE", LV_CPICKER_COLOR_MODE_HUE }, { "CPICKER_COLOR_MODE_SATURATION", LV_CPICKER_COLOR_MODE_SATURATION }, { "CPICKER_COLOR_MODE_VALUE", LV_CPICKER_COLOR_MODE_VALUE }, @@ -173,7 +187,6 @@ const be_constint_t lv0_constants[] = { { "CPICKER_PART_MAIN", LV_CPICKER_PART_MAIN }, { "CPICKER_TYPE_DISC", LV_CPICKER_TYPE_DISC }, { "CPICKER_TYPE_RECT", LV_CPICKER_TYPE_RECT }, - { "CYAN", 65535 }, { "DESIGN_COVER_CHK", LV_DESIGN_COVER_CHK }, { "DESIGN_DRAW_MAIN", LV_DESIGN_DRAW_MAIN }, { "DESIGN_DRAW_POST", LV_DESIGN_DRAW_POST }, @@ -265,8 +278,6 @@ const be_constint_t lv0_constants[] = { { "GRAD_DIR_HOR", LV_GRAD_DIR_HOR }, { "GRAD_DIR_NONE", LV_GRAD_DIR_NONE }, { "GRAD_DIR_VER", LV_GRAD_DIR_VER }, - { "GRAY", 8421504 }, - { "GREEN", 32768 }, { "IMG_CF_ALPHA_1BIT", LV_IMG_CF_ALPHA_1BIT }, { "IMG_CF_ALPHA_2BIT", LV_IMG_CF_ALPHA_2BIT }, { "IMG_CF_ALPHA_4BIT", LV_IMG_CF_ALPHA_4BIT }, @@ -325,21 +336,16 @@ const be_constint_t lv0_constants[] = { { "LAYOUT_ROW_MID", LV_LAYOUT_ROW_MID }, { "LAYOUT_ROW_TOP", LV_LAYOUT_ROW_TOP }, { "LED_PART_MAIN", LV_LED_PART_MAIN }, - { "LIME", 65280 }, { "LINEMETER_PART_MAIN", LV_LINEMETER_PART_MAIN }, { "LIST_PART_BG", LV_LIST_PART_BG }, { "LIST_PART_EDGE_FLASH", LV_LIST_PART_EDGE_FLASH }, { "LIST_PART_SCROLLBAR", LV_LIST_PART_SCROLLBAR }, - { "MAGENTA", 16711935 }, - { "MAROON", 8388608 }, { "MSGBOX_PART_BG", LV_MSGBOX_PART_BG }, { "MSGBOX_PART_BTN", LV_MSGBOX_PART_BTN }, { "MSGBOX_PART_BTN_BG", LV_MSGBOX_PART_BTN_BG }, - { "NAVY", 128 }, { "OBJMASK_PART_MAIN", LV_OBJMASK_PART_MAIN }, { "OBJ_PART_ALL", LV_OBJ_PART_ALL }, { "OBJ_PART_MAIN", LV_OBJ_PART_MAIN }, - { "OLIVE", 8421376 }, { "OPA_0", LV_OPA_0 }, { "OPA_10", LV_OPA_10 }, { "OPA_100", LV_OPA_100 }, @@ -369,9 +375,7 @@ const be_constint_t lv0_constants[] = { { "PROTECT_PARENT", LV_PROTECT_PARENT }, { "PROTECT_POS", LV_PROTECT_POS }, { "PROTECT_PRESS_LOST", LV_PROTECT_PRESS_LOST }, - { "PURPLE", 8388736 }, - { "RADIUS_CIRCLE", 32767 }, - { "RED", 16711680 }, + { "RADIUS_CIRCLE", LV_RADIUS_CIRCLE }, { "ROLLER_MODE_INFINITE", LV_ROLLER_MODE_INFINITE }, { "ROLLER_MODE_NORMAL", LV_ROLLER_MODE_NORMAL }, { "ROLLER_PART_BG", LV_ROLLER_PART_BG }, @@ -392,7 +396,6 @@ const be_constint_t lv0_constants[] = { { "SCR_LOAD_ANIM_OVER_LEFT", LV_SCR_LOAD_ANIM_OVER_LEFT }, { "SCR_LOAD_ANIM_OVER_RIGHT", LV_SCR_LOAD_ANIM_OVER_RIGHT }, { "SCR_LOAD_ANIM_OVER_TOP", LV_SCR_LOAD_ANIM_OVER_TOP }, - { "SILVER", 12632256 }, { "SLIDER_PART_BG", LV_SLIDER_PART_BG }, { "SLIDER_PART_INDIC", LV_SLIDER_PART_INDIC }, { "SLIDER_PART_KNOB", LV_SLIDER_PART_KNOB }, @@ -527,7 +530,6 @@ const be_constint_t lv0_constants[] = { { "TABVIEW_TAB_POS_NONE", LV_TABVIEW_TAB_POS_NONE }, { "TABVIEW_TAB_POS_RIGHT", LV_TABVIEW_TAB_POS_RIGHT }, { "TABVIEW_TAB_POS_TOP", LV_TABVIEW_TAB_POS_TOP }, - { "TEAL", 32896 }, { "TEXTAREA_CURSOR_LAST", LV_TEXTAREA_CURSOR_LAST }, { "TEXTAREA_PART_BG", LV_TEXTAREA_PART_BG }, { "TEXTAREA_PART_CURSOR", LV_TEXTAREA_PART_CURSOR }, @@ -549,12 +551,10 @@ const be_constint_t lv0_constants[] = { { "TXT_FLAG_NONE", LV_TXT_FLAG_NONE }, { "TXT_FLAG_RECOLOR", LV_TXT_FLAG_RECOLOR }, { "TXT_FLAG_RIGHT", LV_TXT_FLAG_RIGHT }, - { "WHITE", 16777215 }, { "WIN_PART_BG", LV_WIN_PART_BG }, { "WIN_PART_CONTENT_SCROLLABLE", LV_WIN_PART_CONTENT_SCROLLABLE }, { "WIN_PART_HEADER", LV_WIN_PART_HEADER }, { "WIN_PART_SCROLLBAR", LV_WIN_PART_SCROLLBAR }, - { "YELLOW", 16776960 }, }; diff --git a/tools/lv_berry/lv_module.h b/tools/lv_berry/lv_module.h index e5ae54589..392dfb2ec 100644 --- a/tools/lv_berry/lv_module.h +++ b/tools/lv_berry/lv_module.h @@ -1,24 +1,24 @@ // LV Colors - we store in 24 bits format and will convert at runtime // This is specific treatment because we keep colors in 24 bits format -WHITE=0xFFFFFF -SILVER=0xC0C0C0 -GRAY=0x808080 -BLACK=0x000000 -RED=0xFF0000 -MAROON=0x800000 -YELLOW=0xFFFF00 -OLIVE=0x808000 -LIME=0x00FF00 -GREEN=0x008000 -CYAN=0x00FFFF -AQUA=0x00FFFF -TEAL=0x008080 -BLUE=0x0000FF -NAVY=0x000080 -MAGENTA=0xFF00FF -PURPLE=0x800080 +COLOR_WHITE=0xFFFFFF +COLOR_SILVER=0xC0C0C0 +COLOR_GRAY=0x808080 +COLOR_BLACK=0x000000 +COLOR_RED=0xFF0000 +COLOR_MAROON=0x800000 +COLOR_YELLOW=0xFFFF00 +COLOR_OLIVE=0x808000 +COLOR_LIME=0x00FF00 +COLOR_GREEN=0x008000 +COLOR_CYAN=0x00FFFF +COLOR_AQUA=0x00FFFF +COLOR_TEAL=0x008080 +COLOR_BLUE=0x0000FF +COLOR_NAVY=0x000080 +COLOR_MAGENTA=0xFF00FF +COLOR_PURPLE=0x800080 -LV_RADIUS_CIRCLE=0x7FFF +LV_RADIUS_CIRCLE LV_STYLE_PROP_ALL // LV_SCR_LOAD_ANIM_NONE