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

Replace S6R text by SxR since it handles both S6R and S8R

Browse Source
This commit is contained in:
3djc
2017-11-11 09:38:10 +01:00
parent 5a121bfcb8
commit c30ff28f85
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/sdcard/horus/SxR/SxR.lua
+2 -2
View File
@@ -41,7 +41,7 @@ local wingBitmapsFile = {"img/plane_b.png", "img/delta_b.png", "img/planev_b.png
local mountBitmapsFile = {"img/up.png", "img/down.png", "img/vert.png", "img/vert-r.png"}
local settingsFields = {
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"SxR functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
@@ -122,7 +122,7 @@ end
-- Redraw the current page
local function redrawFieldsPage(event)
lcd.clear()
drawScreenTitle("S6R", page, #pages)
drawScreenTitle("SxR", page, #pages)
if refreshIndex < #fields then
drawProgressBar()
radio/sdcard/horus/SxR/SxR_Calibrate.lua
+4 -4
View File
@@ -44,7 +44,7 @@ local mountBitmapsFile = {"img/up.png", "img/down.png", "img/vert.png", "img/ver
local calibBitmapsFile = {"img/up.png", "img/down.png", "img/left.png", "img/right.png", "img/forward.png", "img/back.png"}
local settingsFields = {
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"SxR functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
{"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
@@ -124,7 +124,7 @@ end
-- Redraw the current page
local function redrawFieldsPage(event)
lcd.clear()
drawScreenTitle("S6R", page, #pages)
drawScreenTitle("SxR", page, #pages)
if refreshIndex < #fields then
drawProgressBar()
@@ -291,10 +291,10 @@ local function runCalibrationPage(event)
refreshIndex = 0
end
lcd.clear()
drawScreenTitle("S6R", page, #pages)
drawScreenTitle("SxR", page, #pages)
if(calibrationStep < 6) then
local position = calibrationPositions[1 + calibrationStep]
lcd.drawText(100, 50, "Place the S6R in the following position", TEXT_COLOR)
lcd.drawText(100, 50, "Place the SxR in the following position", TEXT_COLOR)
if calibBitmaps[calibrationStep + 1] == nil then
calibBitmaps[calibrationStep + 1] = Bitmap.open(calibBitmapsFile[calibrationStep + 1])
end
radio/sdcard/taranis-x7/SxR/SxR.lua
+2 -2
View File
@@ -33,7 +33,7 @@ local configFields = {
}
local settingsFields = {
{"S6R functions", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"SxR functions", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
{"CH5 mode", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
{"CH6 mode", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
@@ -101,7 +101,7 @@ end
-- Redraw the current page
local function redrawFieldsPage()
lcd.clear()
lcd.drawScreenTitle("S6R", page, #pages)
lcd.drawScreenTitle("SxR", page, #pages)
if refreshIndex < #fields then
drawProgressBar()
radio/sdcard/taranis-x7/SxR/SxR_Calibrate.lua
+5 -5
View File
@@ -56,9 +56,9 @@ end
-- Draw initial warning page
local function runWarningPage(event)
lcd.clear()
lcd.drawScreenTitle("S6R Calibration", page, #pages)
lcd.drawScreenTitle("SxR Calibration", page, #pages)
lcd.drawText(0, 10, "You only need to calibrate", SMLSIZE)
lcd.drawText(0, 20, "once. You will need the S6R,", SMLSIZE)
lcd.drawText(0, 20, "once. You will need the SxR,", SMLSIZE)
lcd.drawText(0, 30, "power, and a level surface.", SMLSIZE)
lcd.drawText(0, 40, "Press [Enter] when ready", SMLSIZE)
lcd.drawText(0, 50, "Press [Exit] to cancel", SMLSIZE)
@@ -74,7 +74,7 @@ end
-- Redraw the current page
local function redrawFieldsPage()
lcd.clear()
lcd.drawScreenTitle("S6R Calibration", page, #pages)
lcd.drawScreenTitle("SxR Calibration", page, #pages)
if refreshIndex < #fields then
drawProgressBar()
@@ -219,7 +219,7 @@ local function drawCalibrationOrientation(x, y, step)
{"Label facing you", "Pins Right", 0, 1000, 0, 0, -1000, 0},
{"Label facing you", "Pins Left", 0, -1000 , 0, 0, 1000, 0} }
lcd.drawText(0, 9, "Place the S6R as follows:", 0)
lcd.drawText(0, 9, "Place the SxR as follows:", 0)
lcd.drawText(x-9, y, orientation[step][1])
lcd.drawText(x-9, y+10, orientation[step][2])
local positionStatus = 0
@@ -248,7 +248,7 @@ local function runCalibrationPage(event)
refreshIndex = 0
end
lcd.clear()
lcd.drawScreenTitle("S6R Calibration", page, #pages)
lcd.drawScreenTitle("SxR Calibration", page, #pages)
if(calibrationStep < 6) then
drawCalibrationOrientation(10, 24, 1 + calibrationStep)
radio/sdcard/taranis-x9/SxR/SxR.lua
+1 -1
View File
@@ -35,7 +35,7 @@ local configFields = {
}
local settingsFields = {
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"SxR functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
{"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
radio/sdcard/taranis-x9/SxR/SxR_Calibrate.lua
+6 -6
View File
@@ -54,9 +54,9 @@ end
-- Draw initial warning page
local function runWarningPage(event)
lcd.clear()
lcd.drawScreenTitle("S6R", page, #pages)
lcd.drawText(0, 10, "Warning: this will start S6R calibration", SMLSIZE)
lcd.drawText(0, 20, "This need to be run only once. You need a S6R,", SMLSIZE)
lcd.drawScreenTitle("SxR", page, #pages)
lcd.drawText(0, 10, "Warning: this will start SxR calibration", SMLSIZE)
lcd.drawText(0, 20, "This need to be run only once. You need a SxR,", SMLSIZE)
lcd.drawText(0, 30, "power supply and a flat level surface (desk,...)", SMLSIZE)
lcd.drawText(0, 40, "Press [Enter] when ready", SMLSIZE)
lcd.drawText(0, 50, "Press [Exit] when cancel", SMLSIZE)
@@ -72,7 +72,7 @@ end
-- Redraw the current page
local function redrawFieldsPage()
lcd.clear()
lcd.drawScreenTitle("S6R", page, #pages)
lcd.drawScreenTitle("SxR", page, #pages)
if refreshIndex < #fields then
drawProgressBar()
@@ -217,9 +217,9 @@ local function runCalibrationPage(event)
refreshIndex = 0
end
lcd.clear()
lcd.drawScreenTitle("S6R", page, #pages)
lcd.drawScreenTitle("SxR", page, #pages)
if(calibrationStep < 6) then
lcd.drawText(0, 9, "Turn the S6R as shown", 0)
lcd.drawText(0, 9, "Turn the SxR as shown", 0)
lcd.drawPixmap(10, 19, calibrationPositionsBitmaps[1 + calibrationStep])
for index = 1, 3, 1 do
local field = fields[index]