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

Merge pull request #6559 from opentx/3djc/CRSF-scripts-update

Browse Source 
3djc/crsf scripts update
This commit is contained in:
3djc
2019-07-09 18:35:59 +02:00
committed by GitHub
parent bcc72ffa46 151b6b63c9
commit bd92b86bec
6 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/sdcard/horus/CROSSFIRE/crossfire.lua
+4 -4
View File
@@ -87,11 +87,11 @@ local function run(event)
if event == nil then if event == nil then
error("Cannot be run as a model script!") error("Cannot be run as a model script!")
return 2 return 2
elseif event == EVT_EXIT_BREAK then elseif event == EVT_VIRTUAL_EXIT then
return 2 return 2
elseif event == EVT_ROT_LEFT then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_ROT_RIGHT then elseif event == EVT_VIRTUAL_PREVIOUS then
selectDevice(-1) selectDevice(-1)
end end
@@ -105,7 +105,7 @@ local function run(event)
else else
for i=1, #devices do for i=1, #devices do
local attr = (lineIndex == i and INVERS or 0) local attr = (lineIndex == i and INVERS or 0)
if event == EVT_ROT_BREAK and attr == INVERS then if event == EVT_VIRTUAL_ENTER and attr == INVERS then
crossfireTelemetryPush(0x28, { devices[i].id, 0xEA }) crossfireTelemetryPush(0x28, { devices[i].id, 0xEA })
return "device.lua" return "device.lua"
end end
radio/sdcard/horus/CROSSFIRE/device.lua
+5 -5
View File
@@ -435,7 +435,7 @@ local function runDevicePage(event)
else else
return "crossfire.lua" return "crossfire.lua"
end end
elseif event == EVT_ROT_BREAK then -- toggle editing/selecting current field elseif event == EVT_VIRTUAL_EXIT then -- toggle editing/selecting current field
local field = getField(lineIndex) local field = getField(lineIndex)
if field.name then if field.name then
if field.type == 10 then if field.type == 10 then
@@ -456,15 +456,15 @@ local function runDevicePage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_ROT_LEFT then if event == EVT_VIRTUAL_NEXT then
incrField(1) incrField(1)
elseif event == EVT_ROT_RIGHT then elseif event == EVT_VIRTUAL_PREVIOUS then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_ROT_RIGHT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_ROT_LEFT then elseif event == EVT_VIRTUAL_PREVIOUS then
selectField(-1) selectField(-1)
end end
end end
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/CROSSFIRE/crossfire.lua
+4 -4
View File
@@ -86,11 +86,11 @@ local function run(event)
if event == nil then if event == nil then
error("Cannot be run as a model script!") error("Cannot be run as a model script!")
return 2 return 2
elseif event == EVT_EXIT_BREAK then elseif event == EVT_VIRTUAL_EXIT then
return 2 return 2
elseif event == EVT_ROT_LEFT or event == EVT_DOWN_BREAK then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_ROT_RIGHT or event == EVT_UP_BREAK then elseif event == EVT_VIRTUAL_PREVIOUS then
selectDevice(-1) selectDevice(-1)
end end
@@ -101,7 +101,7 @@ local function run(event)
else else
for i=1, #devices do for i=1, #devices do
local attr = (lineIndex == i and INVERS or 0) local attr = (lineIndex == i and INVERS or 0)
if (event == EVT_ROT_BREAK or event == EVT_RIGHT_BREAK) and attr == INVERS then if event == EVT_VIRTUAL_ENTER and attr == INVERS then
crossfireTelemetryPush(0x28, { devices[i].id, 0xEA }) crossfireTelemetryPush(0x28, { devices[i].id, 0xEA })
return "device.lua" return "device.lua"
end end
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/CROSSFIRE/device.lua
+6 -6
View File
@@ -419,7 +419,7 @@ end
-- Main -- Main
local function runDevicePage(event) local function runDevicePage(event)
if event == EVT_EXIT_BREAK then -- exit script if event == EVT_VIRTUAL_EXIT then -- exit script
if edit == true then if edit == true then
edit = false edit = false
local field = getField(lineIndex) local field = getField(lineIndex)
@@ -430,7 +430,7 @@ local function runDevicePage(event)
else else
return "crossfire.lua" return "crossfire.lua"
end end
elseif event == EVT_ROT_BREAK or event == EVT_RIGHT_BREAK then -- toggle editing/selecting current field elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field
local field = getField(lineIndex) local field = getField(lineIndex)
if field.name then if field.name then
if field.type == 10 then if field.type == 10 then
@@ -451,15 +451,15 @@ local function runDevicePage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then
incrField(1) incrField(1)
elseif event == EVT_ROT_LEFT or event == EVT_UP_BREAK then elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_ROT_LEFT or event == EVT_UP_BREAK then elseif event == EVT_VIRTUAL_PREVIOUS then
selectField(-1) selectField(-1)
end end
end end
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/CROSSFIRE/crossfire.lua
+4 -4
View File
@@ -86,11 +86,11 @@ local function run(event)
if event == nil then if event == nil then
error("Cannot be run as a model script!") error("Cannot be run as a model script!")
return 2 return 2
elseif event == EVT_EXIT_BREAK then elseif event == EVT_VIRTUAL_EXIT then
return 2 return 2
elseif event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_RIGHT then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_LEFT then elseif event == EVT_VIRTUAL_PREVIOUS then
selectDevice(-1) selectDevice(-1)
end end
@@ -101,7 +101,7 @@ local function run(event)
else else
for i=1, #devices do for i=1, #devices do
local attr = (lineIndex == i and INVERS or 0) local attr = (lineIndex == i and INVERS or 0)
if event == EVT_ENTER_BREAK and attr == INVERS then if event == EVT_VIRTUAL_ENTER and attr == INVERS then
crossfireTelemetryPush(0x28, { devices[i].id, 0xEA }) crossfireTelemetryPush(0x28, { devices[i].id, 0xEA })
return "device.lua" return "device.lua"
end end
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/CROSSFIRE/device.lua
+6 -6
View File
@@ -419,7 +419,7 @@ end
-- Main -- Main
local function runDevicePage(event) local function runDevicePage(event)
if event == EVT_EXIT_BREAK then -- exit script if event == EVT_VIRTUAL_EXIT then -- exit script
if edit == true then if edit == true then
edit = false edit = false
local field = getField(lineIndex) local field = getField(lineIndex)
@@ -430,7 +430,7 @@ local function runDevicePage(event)
else else
return "crossfire.lua" return "crossfire.lua"
end end
elseif event == EVT_ENTER_BREAK then -- toggle editing/selecting current field elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field
local field = getField(lineIndex) local field = getField(lineIndex)
if field.name then if field.name then
if field.type == 10 then if field.type == 10 then
@@ -451,15 +451,15 @@ local function runDevicePage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_LEFT then if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then
incrField(1) incrField(1)
elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_RIGHT then elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT then elseif event == EVT_VIRTUAL_PREVIOUS then
selectField(-1) selectField(-1)
end end
end end