- Add 'quick' mode compatibility (#5099)
- Add compatibility with previous receiver firmware - rename S6R to SxR to acknowledge S8R is supported too
@@ -26,6 +26,7 @@ local mountBitmapsFile = {"img/up.png", "img/down.png", "img/vert.png", "img/ver
|
|||||||
|
|
||||||
local settingsFields = {
|
local settingsFields = {
|
||||||
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
|
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
|
||||||
|
{"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
|
||||||
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
|
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
|
||||||
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
|
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
|
||||||
{"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
|
{"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
|
||||||
@@ -151,7 +152,7 @@ local function refreshNext()
|
|||||||
if telemetryWrite(0x9D, calibrationStep) == true then
|
if telemetryWrite(0x9D, calibrationStep) == true then
|
||||||
refreshState = 1
|
refreshState = 1
|
||||||
calibrationState = 2
|
calibrationState = 2
|
||||||
telemetryPopTimeout = getTime() + 80 -- normal delay is 500ms
|
telemetryPopTimeout = getTime() + 120 -- normal delay is 500ms
|
||||||
end
|
end
|
||||||
elseif #modifications > 0 then
|
elseif #modifications > 0 then
|
||||||
telemetryWrite(modifications[1][1], modifications[1][2])
|
telemetryWrite(modifications[1][1], modifications[1][2])
|
||||||
@@ -199,6 +200,8 @@ local function refreshNext()
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif getTime() > telemetryPopTimeout then
|
elseif getTime() > telemetryPopTimeout then
|
||||||
|
fields[refreshIndex + 1][4] = nil
|
||||||
|
refreshIndex = refreshIndex + 1
|
||||||
refreshState = 0
|
refreshState = 0
|
||||||
calibrationState = 0
|
calibrationState = 0
|
||||||
end
|
end
|
||||||
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 8.9 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
@@ -18,6 +18,7 @@ local configFields = {
|
|||||||
|
|
||||||
local settingsFields = {
|
local settingsFields = {
|
||||||
{"S6R functions", COMBO, 0x9C, nil, { "Disable", "Enable" } },
|
{"S6R functions", COMBO, 0x9C, nil, { "Disable", "Enable" } },
|
||||||
|
{"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
|
||||||
{"CH5 mode", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
|
{"CH5 mode", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
|
||||||
{"CH6 mode", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
|
{"CH6 mode", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
|
||||||
{"AIL direction", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
|
{"AIL direction", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
|
||||||
@@ -132,7 +133,7 @@ local function refreshNext()
|
|||||||
local field = fields[refreshIndex + 1]
|
local field = fields[refreshIndex + 1]
|
||||||
if telemetryRead(field[3]) == true then
|
if telemetryRead(field[3]) == true then
|
||||||
refreshState = 1
|
refreshState = 1
|
||||||
telemetryPopTimeout = getTime() + 80 -- normal delay is 500ms
|
telemetryPopTimeout = getTime() + 120 -- normal delay is 500ms
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif refreshState == 1 then
|
elseif refreshState == 1 then
|
||||||
@@ -163,6 +164,8 @@ local function refreshNext()
|
|||||||
refreshState = 0
|
refreshState = 0
|
||||||
end
|
end
|
||||||
elseif getTime() > telemetryPopTimeout then
|
elseif getTime() > telemetryPopTimeout then
|
||||||
|
fields[refreshIndex + 1][4] = nil
|
||||||
|
refreshIndex = refreshIndex + 1
|
||||||
refreshState = 0
|
refreshState = 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -20,6 +20,7 @@ local configFields = {
|
|||||||
|
|
||||||
local settingsFields = {
|
local settingsFields = {
|
||||||
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
|
{"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
|
||||||
|
{"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
|
||||||
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
|
{"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
|
||||||
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
|
{"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
|
||||||
{"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
|
{"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
|
||||||
@@ -134,7 +135,7 @@ local function refreshNext()
|
|||||||
local field = fields[refreshIndex + 1]
|
local field = fields[refreshIndex + 1]
|
||||||
if telemetryRead(field[3]) == true then
|
if telemetryRead(field[3]) == true then
|
||||||
refreshState = 1
|
refreshState = 1
|
||||||
telemetryPopTimeout = getTime() + 80 -- normal delay is 500ms
|
telemetryPopTimeout = getTime() + 120 -- normal delay is 500ms
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif refreshState == 1 then
|
elseif refreshState == 1 then
|
||||||
@@ -165,6 +166,8 @@ local function refreshNext()
|
|||||||
refreshState = 0
|
refreshState = 0
|
||||||
end
|
end
|
||||||
elseif getTime() > telemetryPopTimeout then
|
elseif getTime() > telemetryPopTimeout then
|
||||||
|
fields[refreshIndex + 1][4] = nil
|
||||||
|
refreshIndex = refreshIndex + 1
|
||||||
refreshState = 0
|
refreshState = 0
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |