Merge pull request #535 from pfeerick/pfeerick/edgetx-constant-updates

fix: black header and unreadable popup menus

Author: haslinghuis

src/SCRIPTS/BF/radios.lua

@@ -88,7 +88,7 @@ local supportedRadios =
             highRes = true,
             MenuBox = { x=120, y=100, w=200, x_offset=68, h_line=20, h_offset=6 },
             SaveBox = { x=120, y=100, w=180, x_offset=12, h=60, h_offset=12 },
-            NoTelem = { 192, LCD_H - 28, "No Telemetry", (TEXT_COLOR or 0) + INVERS + BLINK },
+            NoTelem = { 192, LCD_H - 28, "No Telemetry", (COLOR_THEME_SECONDARY1 or TEXT_COLOR or 0) + INVERS + BLINK },
             textSize = 0,
             yMinLimit = 35,
             yMaxLimit = 235,
@@ -116,7 +116,7 @@ local supportedRadios =
             highRes = true,
             MenuBox = { x=120, y=100, w=200, x_offset=68, h_line=20, h_offset=6 },
             SaveBox = { x=120, y=100, w=180, x_offset=12, h=60, h_offset=12 },
-            NoTelem = { 192, LCD_H - 28, "No Telemetry", (TEXT_COLOR or 0) + INVERS + BLINK },
+            NoTelem = { 192, LCD_H - 28, "No Telemetry", (COLOR_THEME_SECONDARY1 or TEXT_COLOR or 0) + INVERS + BLINK },
             textSize = 0,
             yMinLimit = 35,
             yMaxLimit = 280,
@@ -144,7 +144,7 @@ local supportedRadios =
             highRes = true,
             MenuBox = { x= (LCD_W -200)/2, y=LCD_H/2, w=200, x_offset=68, h_line=20, h_offset=6 },
             SaveBox = { x= (LCD_W -200)/2, y=LCD_H/2, w=180, x_offset=12, h=60, h_offset=12 },
-            NoTelem = { LCD_W/2 - 50, LCD_H - 28, "No Telemetry", (TEXT_COLOR or 0) + INVERS + BLINK },
+            NoTelem = { LCD_W/2 - 50, LCD_H - 28, "No Telemetry", (COLOR_THEME_SECONDARY1 or TEXT_COLOR or 0) + INVERS + BLINK },
             textSize = 0,
             yMinLimit = 35,
             yMaxLimit = 435,
@@ -171,7 +171,7 @@ local supportedRadios =
                 h = 60,
                 h_offset = 12
             },
-            NoTelem = {128, LCD_H - 28, "No Telemetry", (TEXT_COLOR or 0) + INVERS + BLINK},
+            NoTelem = {128, LCD_H - 28, "No Telemetry", (COLOR_THEME_SECONDARY1 or TEXT_COLOR or 0) + INVERS + BLINK},
             textSize = 0,
             yMinLimit = 30,
             yMaxLimit = 200

src/SCRIPTS/BF/ui.lua

@@ -35,10 +35,10 @@ local pageScrollY = 0
 local mainMenuScrollY = 0
 local PageFiles, Page, init, popupMenu
 
-local backgroundFill = TEXT_BGCOLOR or ERASE
-local foregroundColor = LINE_COLOR or SOLID
+local backgroundFill = COLOR_THEME_SECONDARY3 or TEXT_BGCOLOR or ERASE
+local foregroundColor = COLOR_THEME_PRIMARY3 or LINE_COLOR or SOLID
 
-local globalTextOptions = TEXT_COLOR or 0
+local globalTextOptions = COLOR_THEME_SECONDARY1 or TEXT_COLOR or 0
 
 local function saveSettings()
     if Page.values then
@@ -181,8 +181,8 @@ end
 
 local function drawScreenTitle(screenTitle)
     if radio.highRes then
-        lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
-        lcd.drawText(5,5,screenTitle, MENU_TITLE_COLOR)
+        lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1 or TITLE_BGCOLOR)
+        lcd.drawText(5,5,screenTitle, COLOR_THEME_PRIMARY2 or MENU_TITLE_COLOR)
     else
         lcd.drawFilledRectangle(0, 0, LCD_W, 10, FORCE)
         lcd.drawText(1,1,screenTitle,INVERS)