piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wizard in DarkBlue theme

Browse Source
This commit is contained in:
3djc
2020-06-02 09:17:20 +02:00
parent c8b31fc904
commit 515aa9bcdb
2 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua
+19 -20
View File
@@ -149,14 +149,13 @@ local function runMotorConfig(event)
lcd.drawBitmap(BackgroundImg, 0, 0)
lcd.drawBitmap(ImgPageDn, 455, 95)
lcd.drawBitmap(ImgEngine, 310, 50)
lcd.setColor(CUSTOM_COLOR, lcd.RGB(255, 255, 255))
fields = MotorFields
lcd.drawText(40, 20, "Does your model have a motor ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, TEXT_BGCOLOR)
fields[2][4]=0
if fields[1][5] == 1 then
lcd.drawText(40, 100, "What channel is it on ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
fields[2][4]=1
end
local result = runFieldsPage(event)
@@ -190,7 +189,7 @@ local function runAilConfig(event)
lcd.drawBitmap(ImgAilL, 395, 235)
drawMark(308, 115, "A")
drawMark(422, 220, "A")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
setFieldsVisible(1, 0)
elseif fields[1][5] == 2 then
@@ -198,16 +197,16 @@ local function runAilConfig(event)
lcd.drawBitmap(ImgAilL, 395, 235)
drawMark(308, 115, "A")
drawMark(422, 220, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Number of ailerons on your model ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, TEXT_BGCOLOR)
local result = runFieldsPage(event)
return result
end
@@ -235,7 +234,7 @@ local function runFlapsConfig(event)
lcd.drawBitmap(ImgFlp, 358, 202)
drawMark(332, 132, "A")
drawMark(412, 215, "A")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
setFieldsVisible(1, 0)
elseif fields[1][5] == 2 then
@@ -243,16 +242,16 @@ local function runFlapsConfig(event)
lcd.drawBitmap(ImgFlp, 358, 202)
drawMark(332, 132, "A")
drawMark(412, 215, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Does your model have flaps ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, TEXT_BGCOLOR)
local result = runFieldsPage(event)
return result
end
@@ -283,7 +282,7 @@ local function runTailConfig(event)
lcd.drawBitmap(ImgTail, 252, 100)
drawMark(360, 125, "A")
drawMark(390, 155, "A")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
setFieldsVisible(1, 0, 0)
end
@@ -293,9 +292,9 @@ local function runTailConfig(event)
drawMark(415, 150, "A")
drawMark(380, 120, "A")
drawMark(390, 185, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
@@ -305,11 +304,11 @@ local function runTailConfig(event)
drawMark(415, 150, "C")
drawMark(380, 120, "A")
drawMark(390, 185, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
lcd.drawFilledRectangle(40, 202, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 202, 100, 30, TEXT_BGCOLOR)
drawMark(152, 204, "C")
setFieldsVisible(1, 1, 1)
end
@@ -317,14 +316,14 @@ local function runTailConfig(event)
lcd.drawBitmap(ImgVTail, 252, 100)
drawMark(315, 110, "A")
drawMark(382, 120, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
lcd.drawText(40, 20, "Pick the tail config of your model", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, TEXT_BGCOLOR)
local result = runFieldsPage(event)
return result
end
radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua
+20 -21
View File
@@ -144,19 +144,18 @@ local ImgEngine
local function runMotorConfig(event)
lcd.clear()
if ImgEngine == nil then
ImgEngine = Bitmap.open("img/prop.png")
ImgEngine = Bitmap.open("img/prop.png")
end
lcd.drawBitmap(BackgroundImg, 0, 0)
lcd.drawBitmap(ImgPageDn, 455, 95)
lcd.drawBitmap(ImgEngine, 310, 50)
lcd.setColor(CUSTOM_COLOR, lcd.RGB(255, 255, 255))
fields = MotorFields
lcd.drawText(40, 20, "Does your model have a motor ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 200, 30, TEXT_BGCOLOR)
fields[2][4]=0
if fields[1][5] == 1 then
lcd.drawText(40, 100, "What channel is it on ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
fields[2][4]=1
end
local result = runFieldsPage(event)
@@ -190,7 +189,7 @@ local function runAilConfig(event)
lcd.drawBitmap(ImgAilL, 275, 210)
drawMark(362, 132, "A")
drawMark(302, 227, "A")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
setFieldsVisible(1, 0)
elseif fields[1][5] == 2 then
@@ -198,16 +197,16 @@ local function runAilConfig(event)
lcd.drawBitmap(ImgAilL, 275, 210)
drawMark(362, 132, "A")
drawMark(302, 227, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Number of ailerons on your model ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, TEXT_BGCOLOR)
local result = runFieldsPage(event)
return result
end
@@ -235,7 +234,7 @@ local function runFlapsConfig(event)
lcd.drawBitmap(ImgFlp, 285, 191)
drawMark(362, 132, "A")
drawMark(302, 227, "A")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
setFieldsVisible(1, 0)
elseif fields[1][5] == 2 then
@@ -243,16 +242,16 @@ local function runFlapsConfig(event)
lcd.drawBitmap(ImgFlp, 285, 191)
drawMark(362, 132, "A")
drawMark(302, 227, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1)
else
setFieldsVisible(0, 0)
end
lcd.drawText(40, 20, "Does your model have flaps ?", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, TEXT_BGCOLOR)
local result = runFieldsPage(event)
return result
end
@@ -283,7 +282,7 @@ local function runTailConfig(event)
lcd.drawBitmap(ImgTail, 252, 100)
drawMark(275, 120, "A")
drawMark(390, 155, "A")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
setFieldsVisible(1, 0, 0)
end
@@ -293,9 +292,9 @@ local function runTailConfig(event)
drawMark(275, 120, "A")
drawMark(390, 155, "A")
drawMark(370, 112, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
@@ -305,11 +304,11 @@ local function runTailConfig(event)
drawMark(275, 120, "A")
drawMark(390, 155, "C")
drawMark(370, 112, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
lcd.drawFilledRectangle(40, 202, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 202, 100, 30, TEXT_BGCOLOR)
drawMark(152, 204, "C")
setFieldsVisible(1, 1, 1)
end
@@ -317,14 +316,14 @@ local function runTailConfig(event)
lcd.drawBitmap(ImgVTail, 252, 100)
drawMark(315, 110, "A")
drawMark(382, 120, "B")
lcd.drawFilledRectangle(40, 122, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 122, 100, 30, TEXT_BGCOLOR)
drawMark(152, 124, "A")
lcd.drawFilledRectangle(40, 162, 100, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 162, 100, 30, TEXT_BGCOLOR)
drawMark(152, 164, "B")
setFieldsVisible(1, 1, 0)
end
lcd.drawText(40, 20, "Pick the tail config of your model", TEXT_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, CUSTOM_COLOR)
lcd.drawFilledRectangle(40, 45, 400, 30, TEXT_BGCOLOR)
local result = runFieldsPage(event)
return result
end