From cb2a5ed8685cd55bb1812faa773f4b7a9327776e Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 14 Jun 2019 18:06:54 +0200 Subject: [PATCH] More scripts converted to virtuals --- radio/sdcard/FrSky-utilities/FrSky SBEC.lua | 12 ++++++------ radio/sdcard/FrSky-utilities/GasSuit-config.lua | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/radio/sdcard/FrSky-utilities/FrSky SBEC.lua b/radio/sdcard/FrSky-utilities/FrSky SBEC.lua index e09e97e69..7bf997f48 100644 --- a/radio/sdcard/FrSky-utilities/FrSky SBEC.lua +++ b/radio/sdcard/FrSky-utilities/FrSky SBEC.lua @@ -211,10 +211,10 @@ end -- Main1 local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then telemetryUnIdle(0x80) return 2 - elseif event == EVT_ENTER_BREAK or event == EVT_ROT_BREAK then + elseif event == EVT_VIRTUAL_ENTER then if fields[current][4] ~= nil then edit = not edit if edit == false then @@ -222,15 +222,15 @@ local function runFieldsPage(event) end end elseif edit then - if event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_PLUS_REPT or event == EVT_RIGHT_FIRST then + if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT or event == EVT_LEFT_FIRST then + elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_DOWN_FIRST then + if event == EVT_VIRTUAL_NEXT then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT or event == EVT_UP_FIRST then + elseif event == EVT_VIRTUAL_PREVIOUS then selectField(-1) end end diff --git a/radio/sdcard/FrSky-utilities/GasSuit-config.lua b/radio/sdcard/FrSky-utilities/GasSuit-config.lua index 9fb219667..df7fce8ce 100755 --- a/radio/sdcard/FrSky-utilities/GasSuit-config.lua +++ b/radio/sdcard/FrSky-utilities/GasSuit-config.lua @@ -322,9 +322,9 @@ end -- Main1 local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_BREAK or event == EVT_ROT_BREAK then + elseif event == EVT_VIRTUAL_ENTER then if fields[current][4] ~= nil then edit = not edit if edit == false then @@ -332,15 +332,15 @@ local function runFieldsPage(event) end end elseif edit then - if event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_PLUS_REPT or event == EVT_RIGHT_FIRST then + if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT or event == EVT_LEFT_FIRST then + elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_DOWN_FIRST then + if event == EVT_VIRTUAL_NEXT then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT or event == EVT_UP_FIRST then + elseif event == EVT_VIRTUAL_PREVIOUS then selectField(-1) end end @@ -498,9 +498,9 @@ local function run(event) if event == nil then error("Cannot be run as a sensor script!") return 2 - elseif event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST or event == EVT_SHIFT_BREAK then + elseif event == EVT_VIRTUAL_NEXT_PAGE then selectPage(1) - elseif event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST or event == EVT_SHIFT_LONG then + elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then killEvents(event); selectPage(-1) end