From 1065db5831e3aebbbf775e2dd1028aea81a6df87 Mon Sep 17 00:00:00 2001
From: s-hadinger <49731213+s-hadinger@users.noreply.github.com>
Date: Sat, 25 Jan 2025 13:59:26 +0100
Subject: [PATCH] LVLG/HASPmota add color names from OpenHASP (#22879)

---
 CHANGELOG.md                                  |  1 +
 .../generate/be_lvgl_module.c                 | 26 ++++++++++++++++-
 .../lv_binding_berry/mapping/lv_enum.h        | 28 ++++++++++++++++++-
 .../lv_binding_berry/tools/preprocessor.py    | 28 ++++++++++++++++++-
 4 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bceba9c3..32ad7f015 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 - Berry `tasmota.global.tele_period` and `tasmota.settings.tele_period` (#22865)
 - Command `PixelType` to change the WS2812 color order and channel number
 - Berry driver for AXP2102 and M5CoreS3
+- LVLG/HASPmota add color names from OpenHASP
 
 ### Breaking Changed
 
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 a21b4b3e6..21e572462 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
@@ -286,8 +286,14 @@ const be_const_member_t lv0_constants[] = {
     { "CHART_UPDATE_MODE_CIRCULAR", be_cconst_int(LV_CHART_UPDATE_MODE_CIRCULAR) },
     { "CHART_UPDATE_MODE_SHIFT", be_cconst_int(LV_CHART_UPDATE_MODE_SHIFT) },
     { "COLOR_AQUA", be_cconst_int(0x00FFFF) },
+    { "COLOR_AZURE", be_cconst_int(0xF0FFFF) },
+    { "COLOR_BEIGE", be_cconst_int(0xF5F5DC) },
+    { "COLOR_BISQUE", be_cconst_int(0xFFE4C4) },
     { "COLOR_BLACK", be_cconst_int(0x000000) },
     { "COLOR_BLUE", be_cconst_int(0x0000FF) },
+    { "COLOR_BLUSH", be_cconst_int(0xB00000) },
+    { "COLOR_BROWN", be_cconst_int(0xA52A2A) },
+    { "COLOR_CORAL", be_cconst_int(0xFF7F50) },
     { "COLOR_CYAN", be_cconst_int(0x00FFFF) },
     { "COLOR_DEPTH", be_cconst_int(LV_COLOR_DEPTH) },
     { "COLOR_FORMAT_A1", be_cconst_int(LV_COLOR_FORMAT_A1) },
@@ -321,18 +327,36 @@ const be_const_member_t lv0_constants[] = {
     { "COLOR_FORMAT_YUV_END", be_cconst_int(LV_COLOR_FORMAT_YUV_END) },
     { "COLOR_FORMAT_YUV_START", be_cconst_int(LV_COLOR_FORMAT_YUV_START) },
     { "COLOR_FORMAT_YUY2", be_cconst_int(LV_COLOR_FORMAT_YUY2) },
+    { "COLOR_FUCHSIA", be_cconst_int(0xFF00FF) },
+    { "COLOR_GOLD", be_cconst_int(0xFFD700) },
     { "COLOR_GRAY", be_cconst_int(0x808080) },
     { "COLOR_GREEN", be_cconst_int(0x008000) },
+    { "COLOR_GREY", be_cconst_int(0x808080) },
+    { "COLOR_INDIGO", be_cconst_int(0x4B0082) },
+    { "COLOR_IVORY", be_cconst_int(0xFFFFF0) },
+    { "COLOR_KHAKI", be_cconst_int(0xF0E68C) },
     { "COLOR_LIME", be_cconst_int(0x00FF00) },
+    { "COLOR_LINEN", be_cconst_int(0xFAF0E6) },
     { "COLOR_MAGENTA", be_cconst_int(0xFF00FF) },
     { "COLOR_MAROON", be_cconst_int(0x800000) },
     { "COLOR_NAVY", be_cconst_int(0x000080) },
     { "COLOR_OLIVE", be_cconst_int(0x808000) },
-    { "COLOR_ORANGE", be_cconst_int(0xFF7F00) },
+    { "COLOR_ORANGE", be_cconst_int(0xFFA500) },
+    { "COLOR_ORCHID", be_cconst_int(0xDA70D6) },
+    { "COLOR_PERU", be_cconst_int(0xCD853F) },
+    { "COLOR_PINK", be_cconst_int(0xFFC0CB) },
+    { "COLOR_PLUM", be_cconst_int(0xDDA0DD) },
     { "COLOR_PURPLE", be_cconst_int(0x800080) },
     { "COLOR_RED", be_cconst_int(0xFF0000) },
+    { "COLOR_SALMON", be_cconst_int(0xFA8072) },
+    { "COLOR_SIENNA", be_cconst_int(0xA0522D) },
     { "COLOR_SILVER", be_cconst_int(0xC0C0C0) },
+    { "COLOR_SNOW", be_cconst_int(0xFFFAFA) },
+    { "COLOR_TAN", be_cconst_int(0xD2B48C) },
     { "COLOR_TEAL", be_cconst_int(0x008080) },
+    { "COLOR_TOMATO", be_cconst_int(0xFF6347) },
+    { "COLOR_VIOLET", be_cconst_int(0xEE82EE) },
+    { "COLOR_WHEAT", be_cconst_int(0xF5DEB3) },
     { "COLOR_WHITE", be_cconst_int(0xFFFFFF) },
     { "COLOR_YELLOW", be_cconst_int(0xFFFF00) },
     { "COORD_MAX", be_cconst_int(LV_COORD_MAX) },
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 b2d70de4f..90b6f4062 100644
--- a/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h
+++ b/lib/libesp32_lvgl/lv_binding_berry/mapping/lv_enum.h
@@ -23,6 +23,7 @@ LV_LAYOUT_FLEX=>be_LV_LAYOUT_FLEX
 COLOR_WHITE=0xFFFFFF
 COLOR_SILVER=0xC0C0C0
 COLOR_GRAY=0x808080
+COLOR_GREY=0x808080         // OpenHASP
 COLOR_BLACK=0x000000
 COLOR_RED=0xFF0000
 COLOR_MAROON=0x800000
@@ -36,8 +37,33 @@ COLOR_TEAL=0x008080
 COLOR_BLUE=0x0000FF
 COLOR_NAVY=0x000080
 COLOR_MAGENTA=0xFF00FF
-COLOR_ORANGE=0xFF7F00
+COLOR_FUCHSIA=0xFF00FF      // OpenHASP
+COLOR_ORANGE=0xFFA500       // OpenHASP
 COLOR_PURPLE=0x800080
+// Below are OpenHASP additions
+COLOR_PERU=0xCD853F
+COLOR_SIENNA=0xA0522D
+COLOR_BROWN=0xA52A2A
+COLOR_SNOW=0xFFFAFA
+COLOR_IVORY=0xFFFFF0
+COLOR_LINEN=0xFAF0E6
+COLOR_BEIGE=0xF5F5DC
+COLOR_AZURE=0xF0FFFF
+COLOR_SILVER=0xC0C0C0
+COLOR_PINK=0xFFC0CB
+COLOR_PLUM=0xDDA0DD
+COLOR_ORCHID=0xDA70D6
+COLOR_VIOLET=0xEE82EE
+COLOR_INDIGO=0x4B0082
+COLOR_BLUSH=0xB00000
+COLOR_TOMATO=0xFF6347
+COLOR_SALMON=0xFA8072
+COLOR_CORAL=0xFF7F50
+COLOR_GOLD=0xFFD700
+COLOR_KHAKI=0xF0E68C
+COLOR_BISQUE=0xFFE4C4
+COLOR_WHEAT=0xF5DEB3
+COLOR_TAN=0xD2B48C
 
 // Freetype
 FT_FONT_STYLE_NORMAL=FT_FONT_STYLE_NORMAL
diff --git a/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py b/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py
index cdc5543a9..48b39fa2b 100644
--- a/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py
+++ b/lib/libesp32_lvgl/lv_binding_berry/tools/preprocessor.py
@@ -242,6 +242,7 @@ LV_LAYOUT_FLEX=>be_LV_LAYOUT_FLEX
 COLOR_WHITE=0xFFFFFF
 COLOR_SILVER=0xC0C0C0
 COLOR_GRAY=0x808080
+COLOR_GREY=0x808080         // OpenHASP
 COLOR_BLACK=0x000000
 COLOR_RED=0xFF0000
 COLOR_MAROON=0x800000
@@ -255,8 +256,33 @@ COLOR_TEAL=0x008080
 COLOR_BLUE=0x0000FF
 COLOR_NAVY=0x000080
 COLOR_MAGENTA=0xFF00FF
-COLOR_ORANGE=0xFF7F00
+COLOR_FUCHSIA=0xFF00FF      // OpenHASP
+COLOR_ORANGE=0xFFA500       // OpenHASP
 COLOR_PURPLE=0x800080
+// Below are OpenHASP additions
+COLOR_PERU=0xCD853F
+COLOR_SIENNA=0xA0522D
+COLOR_BROWN=0xA52A2A
+COLOR_SNOW=0xFFFAFA
+COLOR_IVORY=0xFFFFF0
+COLOR_LINEN=0xFAF0E6
+COLOR_BEIGE=0xF5F5DC
+COLOR_AZURE=0xF0FFFF
+COLOR_SILVER=0xC0C0C0
+COLOR_PINK=0xFFC0CB
+COLOR_PLUM=0xDDA0DD
+COLOR_ORCHID=0xDA70D6
+COLOR_VIOLET=0xEE82EE
+COLOR_INDIGO=0x4B0082
+COLOR_BLUSH=0xB00000
+COLOR_TOMATO=0xFF6347
+COLOR_SALMON=0xFA8072
+COLOR_CORAL=0xFF7F50
+COLOR_GOLD=0xFFD700
+COLOR_KHAKI=0xF0E68C
+COLOR_BISQUE=0xFFE4C4
+COLOR_WHEAT=0xF5DEB3
+COLOR_TAN=0xD2B48C
 
 // Freetype
 FT_FONT_STYLE_NORMAL=FT_FONT_STYLE_NORMAL