Converted literal colors to indices that can be used everywhere.

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
+26 -11
View File
@@ -769,16 +769,23 @@ Set a color for specific area
* `COLOR_THEME_DISABLED`
* `CUSTOM_COLOR`
@param color (number) color in 5/6/5 rgb format. The following prefined colors are available
* `WHITE`
* `GREY`
* `LIGHTGREY`
* `DARKGREY`
* `BLACK`
* `YELLOW`
* `BLUE`
* `RED`
* `DARKRED`
@param color (number) color in 5/6/5 rgb format (see lcd.RGB function). The following prefined colors are also available:
* `BLACK`
* `WHITE`
* `LIGHTWHITE`
* `YELLOW`
* `BLUE`
* `DARKBLUE`
* `GREY`
* `DARKGREY`
* `LIGHTGREY`
* `RED`
* `DARKRED`
* `GREEN`
* `LIGHTBROWN`
* `DARKBROWN`
* `BRIGHTGREEN`
* `ORANGE`
@notice Only available on Colorlcd radios
@@ -789,7 +796,15 @@ static int luaLcdSetColor(lua_State *L)
unsigned int index = COLOR_VAL(luaL_checkunsigned(L, 1));
unsigned int color = luaL_checkunsigned(L, 2);
if (index < LCD_COLOR_COUNT)
// Boundary check - also, do not change literal colors
if (index >= COLOR_BLACK_INDEX)
return 0;
// RGB value or color flag?
unsigned int idx = COLOR_VAL(color);
if (idx > DEFAULT_COLOR_INDEX && idx < LCD_COLOR_COUNT)
lcdColorTable[index] = lcdColorTable[idx];
else
lcdColorTable[index] = color;
return 0;
+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