Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 04:45:17 +03:00
Code Issues Wiki Activity

Fix CUSTOM_COLOR,… (#3489)

Browse source 
* Fix CUSTOM_COLOR, also change to way setColor work to a more natural : lcd.setColor(CUSTOM_COLOR, RED)

* Remove _INDEX from TBS main to match the recent change to setColor
This commit is contained in:
3djc 2016-05-13 05:26:18 -07:00 • committed by Bertrand Songis
parent 77888ae200
commit 24abad55ca
3 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

50
radio/sdcard/horus/THEMES/TBS/main.lua
View file

@ -1,31 +1,31 @@
local bitmap = 0 local bitmap = 0
local function load() local function load()
lcd.setColor(TEXT_COLOR_INDEX, WHITE) lcd.setColor(TEXT_COLOR, WHITE)
lcd.setColor(TEXT_BGCOLOR_INDEX, BLACK) lcd.setColor(TEXT_BGCOLOR, BLACK)
lcd.setColor(TEXT_INVERTED_COLOR_INDEX, BLACK) lcd.setColor(TEXT_INVERTED_COLOR, BLACK)
lcd.setColor(TEXT_INVERTED_BGCOLOR_INDEX, YELLOW) lcd.setColor(TEXT_INVERTED_BGCOLOR, YELLOW)
lcd.setColor(LINE_COLOR_INDEX, GREY) lcd.setColor(LINE_COLOR, GREY)
lcd.setColor(SCROLLBOX_COLOR_INDEX, BLUE) lcd.setColor(SCROLLBOX_COLOR, BLUE)
lcd.setColor(MENU_TITLE_BGCOLOR_INDEX, DARKGREY) lcd.setColor(MENU_TITLE_BGCOLOR, DARKGREY)
lcd.setColor(MENU_TITLE_COLOR_INDEX, WHITE) lcd.setColor(MENU_TITLE_COLOR, WHITE)
lcd.setColor(MENU_TITLE_DISABLE_COLOR_INDEX, BLACK) lcd.setColor(MENU_TITLE_DISABLE_COLOR, BLACK)
lcd.setColor(HEADER_COLOR_INDEX, lcd.RGB(32, 34, 42)) lcd.setColor(HEADER_COLOR, lcd.RGB(32, 34, 42))
lcd.setColor(ALARM_COLOR_INDEX, lcd.RGB(32, 34, 42)) lcd.setColor(ALARM_COLOR, lcd.RGB(32, 34, 42))
lcd.setColor(WARNING_COLOR_INDEX, YELLOW) lcd.setColor(WARNING_COLOR, YELLOW)
lcd.setColor(TEXT_DISABLE_COLOR_INDEX, GREY) lcd.setColor(TEXT_DISABLE_COLOR, GREY)
lcd.setColor(CURVE_AXIS_COLOR_INDEX, LIGHTGREY) lcd.setColor(CURVE_AXIS_COLOR, LIGHTGREY)
lcd.setColor(CURVE_COLOR_INDEX, lcd.RGB(32, 34, 42)) lcd.setColor(CURVE_COLOR, lcd.RGB(32, 34, 42))
lcd.setColor(CURVE_CURSOR_COLOR_INDEX, lcd.RGB(32, 34, 42)) lcd.setColor(CURVE_CURSOR_COLOR, lcd.RGB(32, 34, 42))
lcd.setColor(TITLE_BGCOLOR_INDEX, lcd.RGB(32, 34, 42)) lcd.setColor(TITLE_BGCOLOR, lcd.RGB(32, 34, 42))
lcd.setColor(TRIM_BGCOLOR_INDEX, YELLOW) lcd.setColor(TRIM_BGCOLOR, YELLOW)
lcd.setColor(TRIM_SHADOW_COLOR_INDEX, lcd.RGB(100, 100, 100)) lcd.setColor(TRIM_SHADOW_COLOR, lcd.RGB(100, 100, 100))
lcd.setColor(MAINVIEW_PANES_COLOR_INDEX, GREY) lcd.setColor(MAINVIEW_PANES_COLOR, GREY)
lcd.setColor(MAINVIEW_GRAPHICS_COLOR_INDEX, WHITE) lcd.setColor(MAINVIEW_GRAPHICS_COLOR, WHITE)
lcd.setColor(HEADER_BGCOLOR_INDEX, BLACK) lcd.setColor(HEADER_BGCOLOR, BLACK)
lcd.setColor(HEADER_ICON_BGCOLOR_INDEX, BLACK) lcd.setColor(HEADER_ICON_BGCOLOR, BLACK)
lcd.setColor(HEADER_CURRENT_BGCOLOR_INDEX, lcd.RGB(10, 78, 121)) lcd.setColor(HEADER_CURRENT_BGCOLOR, lcd.RGB(10, 78, 121))
lcd.setColor(OVERLAY_COLOR_INDEX, BLACK) lcd.setColor(OVERLAY_COLOR, BLACK)
bitmap = lcd.loadBitmap("THEMES/TBS/thumb.bmp") bitmap = lcd.loadBitmap("THEMES/TBS/thumb.bmp")
return 0 return 0
end end

4
radio/src/lua/api_general.cpp
View file

@ -855,6 +855,7 @@ const luaR_value_entry opentxConstants[] = {
#endif #endif
#if defined(COLORLCD) #if defined(COLORLCD)
{ "COLOR", ZoneOption::Color }, { "COLOR", ZoneOption::Color },
{ "CUSTOM_COLOR_INDEX", CUSTOM_COLOR_INDEX },
{ "TEXT_COLOR_INDEX", TEXT_COLOR_INDEX }, { "TEXT_COLOR_INDEX", TEXT_COLOR_INDEX },
{ "TEXT_BGCOLOR_INDEX", TEXT_BGCOLOR_INDEX }, { "TEXT_BGCOLOR_INDEX", TEXT_BGCOLOR_INDEX },
{ "TEXT_INVERTED_COLOR_INDEX", TEXT_INVERTED_COLOR_INDEX }, { "TEXT_INVERTED_COLOR_INDEX", TEXT_INVERTED_COLOR_INDEX },
@ -881,6 +882,7 @@ const luaR_value_entry opentxConstants[] = {
{ "HEADER_ICON_BGCOLOR_INDEX", HEADER_ICON_BGCOLOR_INDEX }, { "HEADER_ICON_BGCOLOR_INDEX", HEADER_ICON_BGCOLOR_INDEX },
{ "HEADER_CURRENT_BGCOLOR_INDEX", HEADER_CURRENT_BGCOLOR_INDEX }, { "HEADER_CURRENT_BGCOLOR_INDEX", HEADER_CURRENT_BGCOLOR_INDEX },
{ "OVERLAY_COLOR_INDEX", OVERLAY_COLOR_INDEX }, { "OVERLAY_COLOR_INDEX", OVERLAY_COLOR_INDEX },
{ "CUSTOM_COLOR", CUSTOM_COLOR },
{ "TEXT_COLOR", TEXT_COLOR }, { "TEXT_COLOR", TEXT_COLOR },
{ "TEXT_BGCOLOR", TEXT_BGCOLOR }, { "TEXT_BGCOLOR", TEXT_BGCOLOR },
{ "TEXT_INVERTED_COLOR", TEXT_INVERTED_COLOR }, { "TEXT_INVERTED_COLOR", TEXT_INVERTED_COLOR },
@ -915,6 +917,8 @@ const luaR_value_entry opentxConstants[] = {
{ "YELLOW", (double)YELLOW }, { "YELLOW", (double)YELLOW },
{ "BLUE", (double)BLUE }, { "BLUE", (double)BLUE },
{ "LIGHTGREY", (double)LIGHTGREY }, { "LIGHTGREY", (double)LIGHTGREY },
{ "RED", (double)RED },
{ "DARKRED", (double)DARKRED },
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
{ "EVT_PAGE_BREAK", EVT_KEY_BREAK(KEY_PAGE) }, { "EVT_PAGE_BREAK", EVT_KEY_BREAK(KEY_PAGE) },

4
radio/src/lua/api_lcd.cpp
View file

@ -560,8 +560,8 @@ static int luaLcdDrawCombobox(lua_State *L)
static int luaLcdSetColor(lua_State *L) static int luaLcdSetColor(lua_State *L)
{ {
if (!luaLcdAllowed) return 0; if (!luaLcdAllowed) return 0;
int index = luaL_checkinteger(L, 1); unsigned int index = luaL_checkunsigned(L, 1) >> 16;
int color = luaL_checkinteger(L, 2); unsigned int color = luaL_checkunsigned(L, 2);
lcdColorTable[index] = color; lcdColorTable[index] = color;
return 0; return 0;
} }