piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat(color): add fixed color set to the color picker (#6182)

Browse Source
This commit is contained in:
philmoz
2025-05-04 21:23:27 +10:00
committed by GitHub
parent 6cbd01b6d8
commit a141e46046
31 changed files with 197 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_general.cpp
+19 -16
View File
@@ -3118,7 +3118,7 @@ LROT_BEGIN(etxcst, NULL, 0)
LROT_NUMENTRY( COLOR_THEME_DISABLED, COLOR2FLAGS(COLOR_THEME_DISABLED_INDEX) )
LROT_NUMENTRY( CUSTOM_COLOR, COLOR2FLAGS(CUSTOM_COLOR_INDEX) )
// Old style theme color constants
// Old style theme color constants - TODO: remove in 3.0
LROT_NUMENTRY( ALARM_COLOR, COLOR2FLAGS(COLOR_THEME_WARNING_INDEX) )
LROT_NUMENTRY( BARGRAPH_BGCOLOR, COLOR2FLAGS(COLOR_THEME_SECONDARY3_INDEX) )
LROT_NUMENTRY( BARGRAPH1_COLOR, COLOR2FLAGS(COLOR_THEME_SECONDARY1_INDEX) )
@@ -3151,21 +3151,24 @@ LROT_BEGIN(etxcst, NULL, 0)
// Literal colors
LROT_NUMENTRY( BLACK, COLOR2FLAGS(COLOR_BLACK_INDEX) )
LROT_NUMENTRY( WHITE, COLOR2FLAGS(COLOR_WHITE_INDEX) )
LROT_NUMENTRY( LIGHTWHITE, RGB2FLAGS(0xEA, 0xEA, 0xEA) )
LROT_NUMENTRY( YELLOW, RGB2FLAGS(0xFF, 0xFF, 0x00) )
LROT_NUMENTRY( BLUE, RGB2FLAGS(0x00, 0x00, 0xFF) )
LROT_NUMENTRY( DARKBLUE, RGB2FLAGS(0x00, 0x00, 0xA0) )
LROT_NUMENTRY( GREY, RGB2FLAGS(0x60, 0x60, 0x60) )
LROT_NUMENTRY( DARKGREY, RGB2FLAGS(0x40, 0x40, 0x40) )
LROT_NUMENTRY( LIGHTGREY, RGB2FLAGS(0xC0, 0xC0, 0xC0) )
LROT_NUMENTRY( RED, RGB2FLAGS(0xFF, 0x00, 0x00) )
LROT_NUMENTRY( DARKRED, RGB2FLAGS(0xA0, 0x00, 0x00) )
LROT_NUMENTRY( GREEN, RGB2FLAGS(0x00, 0xFF, 0x00) )
LROT_NUMENTRY( DARKGREEN, RGB2FLAGS(0x00, 0xA0, 0x00) )
LROT_NUMENTRY( LIGHTBROWN, RGB2FLAGS(0x9C, 0x6D, 0x20) )
LROT_NUMENTRY( DARKBROWN, RGB2FLAGS(0x6A, 0x48, 0x10) )
LROT_NUMENTRY( BRIGHTGREEN, RGB2FLAGS(0x00, 0xB4, 0x3C) )
LROT_NUMENTRY( ORANGE, RGB2FLAGS(0xE5, 0x64, 0x1E) )
LROT_NUMENTRY( LIGHTWHITE, COLOR2FLAGS(COLOR_LIGHTWHITE_INDEX) )
LROT_NUMENTRY( LIGHTGREY, COLOR2FLAGS(COLOR_LIGHTGREY_INDEX) )
LROT_NUMENTRY( GREY, COLOR2FLAGS(COLOR_GREY_INDEX) )
LROT_NUMENTRY( DARKGREY, COLOR2FLAGS(COLOR_DARKGREY_INDEX) )
LROT_NUMENTRY( RED, COLOR2FLAGS(COLOR_RED_INDEX) )
LROT_NUMENTRY( DARKRED, COLOR2FLAGS(COLOR_DARKRED_INDEX) )
// LROT_NUMENTRY( LIGHTRED, COLOR2FLAGS(COLOR_LIGHTRED_INDEX) ) // Add once above legacy entries are removed
LROT_NUMENTRY( GREEN, COLOR2FLAGS(COLOR_GREEN_INDEX) )
LROT_NUMENTRY( DARKGREEN, COLOR2FLAGS(COLOR_DARKGREEN_INDEX) )
LROT_NUMENTRY( BRIGHTGREEN, COLOR2FLAGS(COLOR_BRIGHTGREEN_INDEX) )
LROT_NUMENTRY( BLUE, COLOR2FLAGS(COLOR_BLUE_INDEX) )
LROT_NUMENTRY( DARKBLUE, COLOR2FLAGS(COLOR_DARKBLUE_INDEX) )
// LROT_NUMENTRY( CYAN, COLOR2FLAGS(COLOR_CYAN_INDEX) ) // Add once above legacy entries are removed
LROT_NUMENTRY( YELLOW, COLOR2FLAGS(COLOR_YELLOW_INDEX) )
LROT_NUMENTRY( LIGHTBROWN, COLOR2FLAGS(COLOR_LIGHTBROWN_INDEX) )
LROT_NUMENTRY( DARKBROWN, COLOR2FLAGS(COLOR_DARKBROWN_INDEX) )
LROT_NUMENTRY( ORANGE, COLOR2FLAGS(COLOR_ORANGE_INDEX) )
// LROT_NUMENTRY( MAGENTA, COLOR2FLAGS(COLOR_MAGENTA_INDEX) ) // Add once above legacy entries are removed
#else
LROT_NUMENTRY( FIXEDWIDTH, FIXEDWIDTH )