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

Converted literal colors to indices that can be used everywhere.

Browse Source 
Also modified lcd.setColor function so it accepts either RGB or index color as new color. That way, literal colors work as before.
This commit is contained in:
jfrickmann
2021-08-22 19:39:50 +02:00
committed by Raphael Coeffic
parent 8fb260d2b2
commit d0e4b767d3
5 changed files with 96 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_general.cpp
+16 -9
View File
@@ -1950,15 +1950,22 @@ const luaR_value_entry opentxConstants[] = {
{ "WARNING_COLOR", COLOR2FLAGS(COLOR_THEME_WARNING_INDEX) },
// Literal colors
{ "WHITE", (double)WHITE },
{ "GREY", (double)GREY },
{ "DARKGREY", (double)DARKGREY },
{ "BLACK", (double)BLACK },
{ "YELLOW", (double)YELLOW },
{ "BLUE", (double)BLUE },
{ "LIGHTGREY", (double)LIGHTGREY },
{ "RED", (double)RED },
{ "DARKRED", (double)DARKRED },
{ "BLACK", COLOR2FLAGS(COLOR_BLACK_INDEX) },
{ "WHITE", COLOR2FLAGS(COLOR_WHITE_INDEX) },
{ "LIGHTWHITE", COLOR2FLAGS(COLOR_LIGHTWHITE_INDEX) },
{ "YELLOW", COLOR2FLAGS(COLOR_YELLOW_INDEX) },
{ "BLUE", COLOR2FLAGS(COLOR_BLUE_INDEX) },
{ "DARKBLUE", COLOR2FLAGS(COLOR_DARKBLUE_INDEX) },
{ "GREY", COLOR2FLAGS(COLOR_GREY_INDEX) },
{ "DARKGREY", COLOR2FLAGS(COLOR_DARKGREY_INDEX) },
{ "LIGHTGREY", COLOR2FLAGS(COLOR_LIGHTGREY_INDEX) },
{ "RED", COLOR2FLAGS(COLOR_RED_INDEX) },
{ "DARKRED", COLOR2FLAGS(COLOR_DARKRED_INDEX) },
{ "GREEN", COLOR2FLAGS(COLOR_GREEN_INDEX) },
{ "LIGHTBROWN", COLOR2FLAGS(COLOR_LIGHTBROWN_INDEX) },
{ "DARKBROWN", COLOR2FLAGS(COLOR_DARKBROWN_INDEX) },
{ "BRIGHTGREEN", COLOR2FLAGS(COLOR_BRIGHTGREEN_INDEX) },
{ "ORANGE", COLOR2FLAGS(COLOR_ORANGE_INDEX) },
#else
{ "FIXEDWIDTH", FIXEDWIDTH },
#endif