Skip to content

Commit 41362b0

Browse files
committed
fix: TITLE_BGCOLOR constant depreciated
Was missed in #205. Also remove MultiConfig files that should not have been present in bw212.
1 parent d746372 commit 41362b0

File tree

11 files changed

+11
-1009
lines changed

11 files changed

+11
-1009
lines changed

sdcard/bw212x64/UTILITIES/MultiConfigExternal.lua

Lines changed: 0 additions & 499 deletions
This file was deleted.

sdcard/bw212x64/UTILITIES/MultiConfigInternal.lua

Lines changed: 0 additions & 499 deletions
This file was deleted.

sdcard/c480x272/SCRIPTS/TOOLS/FlightsHistory/FlightsHistory4.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ end
128128
local function state_READ_HIST_INIT(event, touchState)
129129
local ui = {
130130
-- draw top-bar
131-
{type="rectangle", x=0, y=0, w=LCD_W, h=20, color=TITLE_BGCOLOR, filled=true},
131+
{type="rectangle", x=0, y=0, w=LCD_W, h=20, color=COLOR_THEME_SECONDARY1, filled=true},
132132
{type="label", x=160, y=1, text="Flight History Viewer", color=WHITE, font=FS.FONT_6},
133133
{type="label", x=440, y=1, text="v" .. app_ver, color=WHITE, font=FS.FONT_6},
134134
-- {type="image", x=0, y=0, w=LCD_W, h=LCD_H, file=script_folder.."bg2.png"},
@@ -154,7 +154,7 @@ local function state_FLIGHTS_COUNT_INIT(event, touchState)
154154
lvgl.build({
155155
-- draw top-bar
156156
{type="rectangle", x=0, y=0, w=LCD_W, h=LCD_H, color=BLACK, filled=true},
157-
{type="rectangle", x=0, y=0, w=LCD_W, h=20, color=TITLE_BGCOLOR, filled=true},
157+
{type="rectangle", x=0, y=0, w=LCD_W, h=20, color=COLOR_THEME_SECONDARY1, filled=true},
158158
{type="label", x=160, y=1, text="Flight History Viewer", color=WHITE, font=FS.FONT_6},
159159
{type="label", x=440, y=1, text="v" .. app_ver, color=WHITE, font=FS.FONT_6},
160160
-- {type="image", x=0, y=0, w=LCD_W, h=LCD_H, file=script_folder.."bg2.png"},
@@ -203,7 +203,7 @@ local function state_SHOW_FLIGHTS_init(event, touchState)
203203
lvgl.build({
204204
-- draw top-bar
205205
{type="rectangle", x=0, y=0, w=LCD_W, h=LCD_H, color=BLACK, filled=true},
206-
{type="rectangle", x=0, y=0, w=LCD_W, h=20, color=TITLE_BGCOLOR, filled=true},
206+
{type="rectangle", x=0, y=0, w=LCD_W, h=20, color=COLOR_THEME_SECONDARY1, filled=true},
207207
{type="label", x=160, y=1, text="Flight History Viewer", color=WHITE, font=FS.FONT_6},
208208
{type="label", x=440, y=1, text="v" .. app_ver, color=WHITE, font=FS.FONT_6},
209209
-- {type="image", x=0, y=0, w=LCD_W, h=LCD_H, file=script_folder.."bg2.png"},

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/FrSky_S8R_S6R/calibrate.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ local function refreshNext()
109109
end
110110

111111
local function drawScreenTitle(title, page, pages)
112-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
112+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
113113
lcd.drawText(130, 5, title, COLOR_THEME_PRIMARY2)
114114
lcd.drawText(LCD_W - 40, 5, page .. "/" .. pages, COLOR_THEME_PRIMARY2)
115115
end

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/FrSky_S8R_S6R/setup.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ local function is_simulator()
129129
end
130130

131131
local function drawScreenTitle(title, page, pages)
132-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
132+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
133133
lcd.drawText(10, 5, title.." ("..app_ver..")", COLOR_THEME_PRIMARY2)
134134
lcd.drawText(LCD_W - 40, 5, page .. "/" .. pages, COLOR_THEME_PRIMARY2)
135135
end

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/SRx_plus/calibrateV1.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ end
100100
-- horus
101101

102102
local function drawScreenTitle(title, page, pages)
103-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
103+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
104104
lcd.drawText(1, 5, title, COLOR_THEME_PRIMARY2)
105105
lcd.drawText(LCD_W-40, 5, page.."/"..pages, COLOR_THEME_PRIMARY2)
106106
end

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/SRx_plus/calibrateV3.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ end
102102

103103
-- horus
104104
local function drawScreenTitle(title, page, pages)
105-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
105+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
106106
lcd.drawText(1, 5, title, COLOR_THEME_PRIMARY2)
107107
lcd.drawText(LCD_W-40, 5, page.."/"..pages, COLOR_THEME_PRIMARY2)
108108
end

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/SRx_plus/setupV1.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ local function drawProgressBar()
266266
end
267267

268268
local function drawScreenTitle(title, page, pages)
269-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
269+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
270270
lcd.drawText(10, 5, title.. " (".. app_ver ..")", COLOR_THEME_PRIMARY2)
271271
lcd.drawText(LCD_W - 40, 5, page .. "/" .. pages, COLOR_THEME_PRIMARY2)
272272
end

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/SRx_plus/setupV3.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ local function drawProgressBar()
466466
end
467467

468468
local function drawScreenTitle(title, page, pages)
469-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
469+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
470470
lcd.drawText(10, 5, title.. " (".. app_ver ..")", COLOR_THEME_PRIMARY2)
471471
lcd.drawText(LCD_W - 40, 5, page .. "/" .. pages, COLOR_THEME_PRIMARY2)
472472
end

sdcard/c480x272/SCRIPTS/TOOLS/FrSky_Gyro_Suite/SRx_plus/stickCalibrateV3.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ local function clibrationInProgress()
126126
end
127127

128128
local function drawScreenTitle(title, page, pages)
129-
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
129+
lcd.drawFilledRectangle(0, 0, LCD_W, 30, COLOR_THEME_SECONDARY1)
130130
lcd.drawText(1, 5, title, COLOR_THEME_PRIMARY2)
131131
--lcd.drawText(LCD_W-40, 5, page.."/"..pages, COLOR_THEME_PRIMARY2)
132132
end

0 commit comments

Comments
 (0)