Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/SCRIPTS/BF/radios.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/SCRIPTS/BF/ui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down