From 24abad55ca24c4dff875b16c3368a2c9d3475521 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Fri, 13 May 2016 05:26:18 -0700
Subject: [PATCH] =?UTF-8?q?Fix=20CUSTOM=5FCOLOR,=E2=80=A6=20(#3489)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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
---
 radio/sdcard/horus/THEMES/TBS/main.lua | 50 +++++++++++++-------------
 radio/src/lua/api_general.cpp          |  4 +++
 radio/src/lua/api_lcd.cpp              |  4 +--
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/radio/sdcard/horus/THEMES/TBS/main.lua b/radio/sdcard/horus/THEMES/TBS/main.lua
index 3defe5d3c..b54df8bbe 100644
--- a/radio/sdcard/horus/THEMES/TBS/main.lua
+++ b/radio/sdcard/horus/THEMES/TBS/main.lua
@@ -1,31 +1,31 @@
 local bitmap = 0
 
 local function load()
-  lcd.setColor(TEXT_COLOR_INDEX, WHITE)
-  lcd.setColor(TEXT_BGCOLOR_INDEX, BLACK)
-  lcd.setColor(TEXT_INVERTED_COLOR_INDEX, BLACK)
-  lcd.setColor(TEXT_INVERTED_BGCOLOR_INDEX, YELLOW)
-  lcd.setColor(LINE_COLOR_INDEX, GREY)
-  lcd.setColor(SCROLLBOX_COLOR_INDEX, BLUE)
-  lcd.setColor(MENU_TITLE_BGCOLOR_INDEX, DARKGREY)
-  lcd.setColor(MENU_TITLE_COLOR_INDEX, WHITE)
-  lcd.setColor(MENU_TITLE_DISABLE_COLOR_INDEX, BLACK)
-  lcd.setColor(HEADER_COLOR_INDEX, lcd.RGB(32, 34, 42))
-  lcd.setColor(ALARM_COLOR_INDEX, lcd.RGB(32, 34, 42))
-  lcd.setColor(WARNING_COLOR_INDEX, YELLOW)
-  lcd.setColor(TEXT_DISABLE_COLOR_INDEX, GREY)
-  lcd.setColor(CURVE_AXIS_COLOR_INDEX, LIGHTGREY)
-  lcd.setColor(CURVE_COLOR_INDEX, lcd.RGB(32, 34, 42))
-  lcd.setColor(CURVE_CURSOR_COLOR_INDEX, lcd.RGB(32, 34, 42))
-  lcd.setColor(TITLE_BGCOLOR_INDEX, lcd.RGB(32, 34, 42))
-  lcd.setColor(TRIM_BGCOLOR_INDEX, YELLOW)
-  lcd.setColor(TRIM_SHADOW_COLOR_INDEX, lcd.RGB(100, 100, 100))
-  lcd.setColor(MAINVIEW_PANES_COLOR_INDEX, GREY)
-  lcd.setColor(MAINVIEW_GRAPHICS_COLOR_INDEX, WHITE)
-  lcd.setColor(HEADER_BGCOLOR_INDEX, BLACK)
-  lcd.setColor(HEADER_ICON_BGCOLOR_INDEX, BLACK)
-  lcd.setColor(HEADER_CURRENT_BGCOLOR_INDEX, lcd.RGB(10, 78, 121))
-  lcd.setColor(OVERLAY_COLOR_INDEX, BLACK)
+  lcd.setColor(TEXT_COLOR, WHITE)
+  lcd.setColor(TEXT_BGCOLOR, BLACK)
+  lcd.setColor(TEXT_INVERTED_COLOR, BLACK)
+  lcd.setColor(TEXT_INVERTED_BGCOLOR, YELLOW)
+  lcd.setColor(LINE_COLOR, GREY)
+  lcd.setColor(SCROLLBOX_COLOR, BLUE)
+  lcd.setColor(MENU_TITLE_BGCOLOR, DARKGREY)
+  lcd.setColor(MENU_TITLE_COLOR, WHITE)
+  lcd.setColor(MENU_TITLE_DISABLE_COLOR, BLACK)
+  lcd.setColor(HEADER_COLOR, lcd.RGB(32, 34, 42))
+  lcd.setColor(ALARM_COLOR, lcd.RGB(32, 34, 42))
+  lcd.setColor(WARNING_COLOR, YELLOW)
+  lcd.setColor(TEXT_DISABLE_COLOR, GREY)
+  lcd.setColor(CURVE_AXIS_COLOR, LIGHTGREY)
+  lcd.setColor(CURVE_COLOR, lcd.RGB(32, 34, 42))
+  lcd.setColor(CURVE_CURSOR_COLOR, lcd.RGB(32, 34, 42))
+  lcd.setColor(TITLE_BGCOLOR, lcd.RGB(32, 34, 42))
+  lcd.setColor(TRIM_BGCOLOR, YELLOW)
+  lcd.setColor(TRIM_SHADOW_COLOR, lcd.RGB(100, 100, 100))
+  lcd.setColor(MAINVIEW_PANES_COLOR, GREY)
+  lcd.setColor(MAINVIEW_GRAPHICS_COLOR, WHITE)
+  lcd.setColor(HEADER_BGCOLOR, BLACK)
+  lcd.setColor(HEADER_ICON_BGCOLOR, BLACK)
+  lcd.setColor(HEADER_CURRENT_BGCOLOR, lcd.RGB(10, 78, 121))
+  lcd.setColor(OVERLAY_COLOR, BLACK)
   bitmap = lcd.loadBitmap("THEMES/TBS/thumb.bmp")
   return 0
 end
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index 9b55b8250..f5227c4e9 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -855,6 +855,7 @@ const luaR_value_entry opentxConstants[] = {
 #endif
 #if defined(COLORLCD)
   { "COLOR", ZoneOption::Color },
+  { "CUSTOM_COLOR_INDEX", CUSTOM_COLOR_INDEX },
   { "TEXT_COLOR_INDEX", TEXT_COLOR_INDEX },
   { "TEXT_BGCOLOR_INDEX", TEXT_BGCOLOR_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_CURRENT_BGCOLOR_INDEX", HEADER_CURRENT_BGCOLOR_INDEX },
   { "OVERLAY_COLOR_INDEX", OVERLAY_COLOR_INDEX },
+  { "CUSTOM_COLOR", CUSTOM_COLOR },
   { "TEXT_COLOR", TEXT_COLOR },
   { "TEXT_BGCOLOR", TEXT_BGCOLOR },
   { "TEXT_INVERTED_COLOR", TEXT_INVERTED_COLOR },
@@ -915,6 +917,8 @@ const luaR_value_entry opentxConstants[] = {
   { "YELLOW", (double)YELLOW },
   { "BLUE", (double)BLUE },
   { "LIGHTGREY", (double)LIGHTGREY },
+  { "RED", (double)RED },
+  { "DARKRED", (double)DARKRED },
 #endif
 #if defined(PCBTARANIS)
   { "EVT_PAGE_BREAK", EVT_KEY_BREAK(KEY_PAGE) },
diff --git a/radio/src/lua/api_lcd.cpp b/radio/src/lua/api_lcd.cpp
index 05bbbc8de..92cbfb7da 100644
--- a/radio/src/lua/api_lcd.cpp
+++ b/radio/src/lua/api_lcd.cpp
@@ -560,8 +560,8 @@ static int luaLcdDrawCombobox(lua_State *L)
 static int luaLcdSetColor(lua_State *L)
 {
   if (!luaLcdAllowed) return 0;
-  int index = luaL_checkinteger(L, 1);
-  int color = luaL_checkinteger(L, 2);
+  unsigned int index = luaL_checkunsigned(L, 1) >> 16;
+  unsigned int color = luaL_checkunsigned(L, 2);
   lcdColorTable[index] = color;
   return 0;
 }