From 23f16d039ec4e2efcb532f83bf69a422d2d406e7 Mon Sep 17 00:00:00 2001 From: Carsten W Date: Mon, 27 Jan 2020 15:10:46 +0100 Subject: [PATCH] Lua virtual replace (#7337) --- .../sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua | 5 ---- .../horus/SCRIPTS/WIZARD/glider/wizard.lua | 16 ++++++------ .../horus/SCRIPTS/WIZARD/plane/wizard.lua | 16 ++++++------ .../horus/SxR Calibrate/SxR_Calibrate.lua | 22 ++++++++-------- .../taranis-x7/SCRIPTS/TOOLS/FrSky SBEC.lua | 5 ---- .../taranis-x7/SCRIPTS/WIZARD/delta.lua | 24 ++++++++--------- .../taranis-x7/SCRIPTS/WIZARD/multi.lua | 24 ++++++++--------- .../taranis-x7/SCRIPTS/WIZARD/plane.lua | 20 +++++++------- .../taranis-x7/SCRIPTS/WIZARD/wizard.lua | 8 +++--- radio/sdcard/taranis-x7/SCRIPTS/snake.lua | 2 +- .../SxR Calibrate/SxR_Calibrate.lua | 24 ++++++++--------- .../taranis-x9/SCRIPTS/TOOLS/FrSky SBEC.lua | 5 ---- .../taranis-x9/SCRIPTS/WIZARD/delta.lua | 20 +++++++------- .../taranis-x9/SCRIPTS/WIZARD/multi.lua | 24 ++++++++--------- .../taranis-x9/SCRIPTS/WIZARD/plane.lua | 20 +++++++------- .../taranis-x9/SCRIPTS/WIZARD/wizard.lua | 8 +++--- radio/sdcard/taranis-x9/SCRIPTS/snake.lua | 2 +- .../SxR Calibrate/SxR_Calibrate.lua | 26 +++++++++---------- 18 files changed, 128 insertions(+), 143 deletions(-) diff --git a/radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua b/radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua index 73d2b88e2..bbe819087 100644 --- a/radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua +++ b/radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua @@ -273,11 +273,6 @@ local function run(event) if event == nil then error("Cannot run as a model script!") return 2 - elseif event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST or event == EVT_SHIFT_BREAK then - --selectPage(1) - elseif event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST or event == EVT_SHIFT_LONG then - --killEvents(event); - --selectPage(-1) end local result = pages[page](event) diff --git a/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua b/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua index 1985589bc..a07089513 100644 --- a/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua +++ b/radio/sdcard/horus/SCRIPTS/WIZARD/glider/wizard.lua @@ -91,9 +91,9 @@ end -- Main local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then -- exit script + if event == EVT_VIRTUAL_EXIT then -- exit script return 2 - elseif event == EVT_ENTER_BREAK or event == EVT_ROT_BREAK then -- toggle editing/selecting current field + elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field if fields[current][5] ~= nil then edit = not edit if edit == false then @@ -101,15 +101,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 then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_NEXT then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_PREV then selectField(-1) end end @@ -465,9 +465,9 @@ local function run(event) if event == nil then error("Cannot be run as a model script!") return 2 - elseif (event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST) and page < #pages-1 then + elseif event == EVT_VIRTUAL_NEXT_PAGE and page < #pages-1 then selectPage(1) - elseif (event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST) and page > 1 then + elseif event == EVT_VIRTUAL_PREV_PAGE and page > 1 then killEvents(event); selectPage(-1) end diff --git a/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua b/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua index 37a78d4e3..3c44e5ad5 100755 --- a/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua +++ b/radio/sdcard/horus/SCRIPTS/WIZARD/plane/wizard.lua @@ -91,9 +91,9 @@ end -- Main local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then -- exit script + if event == EVT_VIRTUAL_EXIT then -- exit script return 2 - elseif event == EVT_ENTER_BREAK or event == EVT_ROT_BREAK then -- toggle editing/selecting current field + elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field if fields[current][5] ~= nil then edit = not edit if edit == false then @@ -101,15 +101,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 then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_NEXT then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_PREV then selectField(-1) end end @@ -465,9 +465,9 @@ local function run(event) if event == nil then error("Cannot be run as a model script!") return 2 - elseif (event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST) and page < #pages-1 then + elseif event == EVT_VIRTUAL_NEXT_PAGE and page < #pages-1 then selectPage(1) - elseif (event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST) and page > 1 then + elseif event == EVT_VIRTUAL_PREV_PAGE and page > 1 then killEvents(event); selectPage(-1) end diff --git a/radio/sdcard/horus/SxR Calibrate/SxR_Calibrate.lua b/radio/sdcard/horus/SxR Calibrate/SxR_Calibrate.lua index 4568b50eb..fca13271f 100755 --- a/radio/sdcard/horus/SxR Calibrate/SxR_Calibrate.lua +++ b/radio/sdcard/horus/SxR Calibrate/SxR_Calibrate.lua @@ -237,9 +237,9 @@ end -- Main local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then -- exit script + if event == EVT_VIRTUAL_EXIT then -- exit script return 2 - elseif event == EVT_ENTER_BREAK or event == EVT_ROT_BREAK then -- toggle editing/selecting current field + elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field if fields[current][4] ~= nil then edit = not edit if edit == false then @@ -247,15 +247,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 then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_NEXT then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_PREV then selectField(-1) end end @@ -313,11 +313,11 @@ local function runCalibrationPage(event) lcd.drawBitmap(Bitmap.open("img/done.bmp"),200, 100) lcd.drawText(160, 220, "Press [RTN] when ready", attr) end - if calibrationStep > 6 and (event == EVT_ENTER_BREAK or event == EVT_EXIT_BREAK) then + if calibrationStep > 6 and (event == EVT_VIRTUAL_ENTER or event == EVT_VIRTUAL_EXIT) then return 2 - elseif event == EVT_ENTER_BREAK then + elseif event == EVT_VIRTUAL_ENTER then calibrationState = 1 - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then if calibrationStep > 0 then calibrationStep = 0 end @@ -341,9 +341,9 @@ local function run(event) if event == nil then error("Cannot be run as a model script!") return 2 - elseif event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST then + elseif event == EVT_VIRTUAL_NEXT_PAGE then selectPage(1) - elseif event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST then + elseif event == EVT_VIRTUAL_PREV_PAGE then killEvents(event); selectPage(-1) end diff --git a/radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky SBEC.lua b/radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky SBEC.lua index 73d2b88e2..bbe819087 100644 --- a/radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky SBEC.lua +++ b/radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky SBEC.lua @@ -273,11 +273,6 @@ local function run(event) if event == nil then error("Cannot run as a model script!") return 2 - elseif event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST or event == EVT_SHIFT_BREAK then - --selectPage(1) - elseif event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST or event == EVT_SHIFT_LONG then - --killEvents(event); - --selectPage(-1) end local result = pages[page](event) diff --git a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/delta.lua b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/delta.lua index b30185e2f..bcd9238f4 100755 --- a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/delta.lua +++ b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/delta.lua @@ -52,10 +52,10 @@ end local function fieldIncDec(event, value, max, force) if edit or force==true then - if event == EVT_ROT_LEFT or event == EVT_UP_BREAK then + if event == EVT_VIRTUAL_PREV or event == EVT_VIRTUAL_PREV_REPT then value = (value + max) dirty = true - elseif event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then + elseif event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then value = (value + max + 2) dirty = true end @@ -66,12 +66,12 @@ end local function valueIncDec(event, value, min, max) if edit then - if event == EVT_ROT_RIGHT or event == EVT_RIGHT_BREAK then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_ROT_LEFT or event == EVT_LEFT_BREAK then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -82,22 +82,22 @@ local function valueIncDec(event, value, min, max) end local function navigate(event, fieldMax, prevPage, nextPage) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then edit = not edit dirty = true elseif edit then - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then edit = false dirty = true elseif not dirty then dirty = blinkChanged() end else - if event == EVT_PAGE_BREAK or event==EVT_RIGHT_BREAK then + if event == EVT_VIRTUAL_NEXT then page = nextPage field = 0 dirty = true - elseif event == EVT_PAGE_LONG or event==EVT_LEFT_BREAK then + elseif event == EVT_VIRTUAL_PREV then page = prevPage field = 0 killEvents(event); @@ -120,7 +120,7 @@ local function getFieldFlags(position) end local function channelIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event==EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -276,7 +276,7 @@ local function servoMenu(event) limits.revert = fieldIncDec(event, limits.revert, 1) end model.setOutput(servoPage, limits) - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then servoPage = nil dirty = true end @@ -348,9 +348,9 @@ local function confirmationMenu(event) navigate(event, fieldsMax, RUDDER_PAGE, page) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_LONG then + elseif event == EVT_VIRTUAL_ENTER_LONG then killEvents(event) applySettings() return 2 diff --git a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/multi.lua b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/multi.lua index ebc7c536f..f4677ed4e 100755 --- a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/multi.lua +++ b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/multi.lua @@ -58,10 +58,10 @@ end local function fieldIncDec(event, value, max, force) if edit or force==true then - if event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_INC then value = (value + max) dirty = true - elseif event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_DEC then value = (value + max + 2) dirty = true end @@ -72,12 +72,12 @@ end local function valueIncDec(event, value, min, max) if edit then - if event == EVT_ROT_RIGHT or event == EVT_RIGHT_FIRST then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_ROT_LEFT or event == EVT_LEFT_FIRST then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -88,11 +88,11 @@ local function valueIncDec(event, value, min, max) end local function navigate(event, fieldMax, prevPage, nextPage) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then edit = not edit dirty = true elseif edit then - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then edit = false dirty = true elseif not dirty then @@ -126,7 +126,7 @@ local function getFieldFlags(position) end local function channelIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event==EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -137,12 +137,12 @@ end local function switchValueIncDec(event, value, min, max) if edit then - if event == EVT_ROT_RIGHT or event == EVT_RIGHT_FIRST then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_ROT_LEFT or event == EVT_LEFT_FIRST then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -153,7 +153,7 @@ local function switchValueIncDec(event, value, min, max) end local function switchIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event== EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -399,9 +399,9 @@ local function confirmationMenu(event) navigate(event, fieldsMax, BEEPER_PAGE, page) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_LONG then + elseif event == EVT_VIRTUAL_ENTER_LONG then killEvents(event) applySettings() return 2 diff --git a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/plane.lua b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/plane.lua index 6558b8f12..26282cdf7 100755 --- a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/plane.lua +++ b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/plane.lua @@ -62,10 +62,10 @@ end local function fieldIncDec(event, value, max, force) if edit or force==true then - if event == EVT_ROT_LEFT or event == EVT_UP_BREAK then + if event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then value = (value + max) dirty = true - elseif event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then + elseif event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then value = (value + max + 2) dirty = true end @@ -76,12 +76,12 @@ end local function valueIncDec(event, value, min, max) if edit then - if event == EVT_ROT_RIGHT or event == EVT_RIGHT_BREAK then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_ROT_LEFT or event == EVT_LEFT_BREAK then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -92,11 +92,11 @@ local function valueIncDec(event, value, min, max) end local function navigate(event, fieldMax, prevPage, nextPage) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then edit = not edit dirty = true elseif edit then - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then edit = false dirty = true elseif not dirty then @@ -130,7 +130,7 @@ local function getFieldFlags(position) end local function channelIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event==EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -420,7 +420,7 @@ local function servoMenu(event) limits.revert = fieldIncDec(event, limits.revert, 1) end model.setOutput(servoPage, limits) - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then servoPage = nil dirty = true end @@ -544,9 +544,9 @@ local function confirmationMenu(event) navigate(event, fieldsMax, TAIL_PAGE, page) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_LONG then + elseif event == EVT_VIRTUAL_ENTER_LONG then killEvents(event) applySettings() return 2 diff --git a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/wizard.lua b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/wizard.lua index 2568f22b9..06f365c9c 100755 --- a/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/wizard.lua +++ b/radio/sdcard/taranis-x7/SCRIPTS/WIZARD/wizard.lua @@ -23,9 +23,9 @@ local MODELTYPE_QUAD = 2 -- Common functions local function fieldIncDec(event, value, max) - if event == EVT_ROT_LEFT or event == EVT_UP_BREAK then + if event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then value = (value + max) - elseif event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then + elseif event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then value = (value + max + 2) end value = (value % (max+1)) @@ -53,7 +53,7 @@ end local function modelTypeMenu(event) drawModelChoiceMenu() - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then if modelType == MODELTYPE_PLANE then return "plane.lua" elseif modelType == MODELTYPE_DELTA then @@ -73,7 +73,7 @@ local function run(event) error("Cannot be run as a model script!") end - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 end diff --git a/radio/sdcard/taranis-x7/SCRIPTS/snake.lua b/radio/sdcard/taranis-x7/SCRIPTS/snake.lua index 012a9f1e1..d3a1914bb 100644 --- a/radio/sdcard/taranis-x7/SCRIPTS/snake.lua +++ b/radio/sdcard/taranis-x7/SCRIPTS/snake.lua @@ -127,7 +127,7 @@ local function run(event) raise("Cannot be run as a model script!") end - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 end diff --git a/radio/sdcard/taranis-x7/SxR Calibrate/SxR_Calibrate.lua b/radio/sdcard/taranis-x7/SxR Calibrate/SxR_Calibrate.lua index 5b2e141a8..b9e406691 100644 --- a/radio/sdcard/taranis-x7/SxR Calibrate/SxR_Calibrate.lua +++ b/radio/sdcard/taranis-x7/SxR Calibrate/SxR_Calibrate.lua @@ -62,10 +62,10 @@ local function runWarningPage(event) 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) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then selectPage(1) return 0 - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then return 2 end return 0 @@ -186,9 +186,9 @@ end -- Main local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then -- exit script + if event == EVT_VIRTUAL_EXIT then -- exit script return 2 - elseif event == EVT_ENTER_BREAK then -- toggle editing/selecting current field + elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field if fields[current][4] ~= nil then edit = not edit if edit == false then @@ -196,15 +196,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_DOWN_BREAK then + if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REP then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT or event == EVT_UP_BREAK then + elseif event == EVT_VIRTUAL_PREV or event == EVT_VIRTUAL_PREV_REP then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_UP_BREAK then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REP then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT or event == EVT_DOWN_BREAK then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REP then selectField(-1) end end @@ -260,9 +260,9 @@ local function runCalibrationPage(event) -- lcd.drawText(10, 19, "Done",0) lcd.drawText(0, 56, "Press [Exit] when ready", attr) end - if calibrationStep > 6 and (event == EVT_ENTER_BREAK or event == EVT_EXIT_BREAK) then + if calibrationStep > 6 and (event == EVT_VIRTUAL_ENTER or event == EVT_VIRTUAL_EXIT) then return 2 - elseif event == EVT_ENTER_BREAK and positionConfirmed then + elseif event == EVT_VIRTUAL_ENTER and positionConfirmed then calibrationState = 1 positionConfirmed = 0 end @@ -284,9 +284,9 @@ local function run(event) if event == nil then error("Cannot be run as a model script!") return 2 - elseif event == EVT_PAGE_BREAK or event==EVT_RIGHT_BREAK then + elseif event == EVT_VIRTUAL_NEXT_PAGE then selectPage(1) - elseif event == EVT_PAGE_LONG or event==EVT_LEFT_BREAK then + elseif event == EVT_VIRTUAL_PREV_PAGE then killEvents(event); selectPage(-1) end diff --git a/radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky SBEC.lua b/radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky SBEC.lua index 73d2b88e2..bbe819087 100644 --- a/radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky SBEC.lua +++ b/radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky SBEC.lua @@ -273,11 +273,6 @@ local function run(event) if event == nil then error("Cannot run as a model script!") return 2 - elseif event == EVT_PAGE_BREAK or event == EVT_PAGEDN_FIRST or event == EVT_SHIFT_BREAK then - --selectPage(1) - elseif event == EVT_PAGE_LONG or event == EVT_PAGEUP_FIRST or event == EVT_SHIFT_LONG then - --killEvents(event); - --selectPage(-1) end local result = pages[page](event) diff --git a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.lua index 06af19541..cf559c6b2 100644 --- a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.lua +++ b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/delta.lua @@ -52,10 +52,10 @@ end local function fieldIncDec(event, value, max, force) if edit or force==true then - if event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT then + if event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then value = (value + max) dirty = true - elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT then + elseif event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then value = (value + max + 2) dirty = true end @@ -66,12 +66,12 @@ end local function valueIncDec(event, value, min, max) if edit then - if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -82,11 +82,11 @@ local function valueIncDec(event, value, min, max) end local function navigate(event, fieldMax, prevPage, nextPage) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then edit = not edit dirty = true elseif edit then - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then edit = false dirty = true elseif not dirty then @@ -120,7 +120,7 @@ local function getFieldFlags(position) end local function channelIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event == EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -284,7 +284,7 @@ local function servoMenu(event) limits.revert = fieldIncDec(event, limits.revert, 1) end model.setOutput(servoPage, limits) - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then servoPage = nil dirty = true end @@ -357,9 +357,9 @@ local function confirmationMenu(event) navigate(event, fieldsMax, RUDDER_PAGE, page) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_LONG then + elseif event == EVT_VIRTUAL_ENTER_LONG then killEvents(event) applySettings() return 2 diff --git a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi.lua index 773abafad..3296626ad 100644 --- a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi.lua +++ b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/multi.lua @@ -57,10 +57,10 @@ end local function fieldIncDec(event, value, max, force) if edit or force==true then - if event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT then + if event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then value = (value + max) dirty = true - elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT then + elseif event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then value = (value + max + 2) dirty = true end @@ -71,12 +71,12 @@ end local function valueIncDec(event, value, min, max) if edit then - if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -87,11 +87,11 @@ local function valueIncDec(event, value, min, max) end local function navigate(event, fieldMax, prevPage, nextPage) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then edit = not edit dirty = true elseif edit then - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then edit = false dirty = true elseif not dirty then @@ -125,7 +125,7 @@ local function getFieldFlags(position) end local function channelIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event == EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -136,12 +136,12 @@ end local function switchValueIncDec(event, value, min, max) if edit then - if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -152,7 +152,7 @@ local function switchValueIncDec(event, value, min, max) end local function switchIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event == EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -415,9 +415,9 @@ local function confirmationMenu(event) navigate(event, fieldsMax, BEEPER_PAGE, page) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_LONG then + elseif event == EVT_VIRTUAL_ENTER_LONG then killEvents(event) applySettings() return 2 diff --git a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.lua index 5a75fbcc1..7d20bd97e 100644 --- a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.lua +++ b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/plane.lua @@ -62,10 +62,10 @@ end local function fieldIncDec(event, value, max, force) if edit or force==true then - if event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT then + if event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then value = (value + max) dirty = true - elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT then + elseif event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then value = (value + max + 2) dirty = true end @@ -76,12 +76,12 @@ end local function valueIncDec(event, value, min, max) if edit then - if event == EVT_PLUS_FIRST or event == EVT_PLUS_REPT or event == EVT_ROT_RIGHT then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then if value < max then value = (value + 1) dirty = true end - elseif event == EVT_MINUS_FIRST or event == EVT_MINUS_REPT or event == EVT_ROT_LEFT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then if value > min then value = (value - 1) dirty = true @@ -92,11 +92,11 @@ local function valueIncDec(event, value, min, max) end local function navigate(event, fieldMax, prevPage, nextPage) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then edit = not edit dirty = true elseif edit then - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then edit = false dirty = true elseif not dirty then @@ -130,7 +130,7 @@ local function getFieldFlags(position) end local function channelIncDec(event, value) - if not edit and event==EVT_MENU_BREAK then + if not edit and event == EVT_VIRTUAL_MENU then servoPage = value dirty = true else @@ -425,7 +425,7 @@ local function servoMenu(event) limits.revert = fieldIncDec(event, limits.revert, 1) end model.setOutput(servoPage, limits) - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then servoPage = nil dirty = true end @@ -550,9 +550,9 @@ local function confirmationMenu(event) navigate(event, fieldsMax, TAIL_PAGE, page) - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 - elseif event == EVT_ENTER_LONG then + elseif event == EVT_VIRTUAL_ENTER_LONG then killEvents(event) applySettings() return 2 diff --git a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/wizard.lua b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/wizard.lua index 463522765..7d330daae 100644 --- a/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/wizard.lua +++ b/radio/sdcard/taranis-x9/SCRIPTS/WIZARD/wizard.lua @@ -25,10 +25,10 @@ local MODELTYPE_QUAD = 2 -- Common functions local function fieldIncDec(event, value, max) - if event == EVT_PLUS_BREAK or event == EVT_ROT_LEFT or event == EVT_PLUS_REPT then + if event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then value = (value + max) dirty = true - elseif event == EVT_MINUS_BREAK or event == EVT_ROT_RIGHT or event == EVT_MINUS_REPT then + elseif event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then value = (value + max + 2) dirty = true end @@ -56,7 +56,7 @@ local function modelTypeMenu(event) drawModelChoiceMenu() dirty = false end - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then if modelType == MODELTYPE_PLANE then return "plane.lua" elseif modelType == MODELTYPE_DELTA then @@ -77,7 +77,7 @@ local function run(event) error("Cannot be run as a model script!") end - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 end return modelTypeMenu(event) diff --git a/radio/sdcard/taranis-x9/SCRIPTS/snake.lua b/radio/sdcard/taranis-x9/SCRIPTS/snake.lua index 012a9f1e1..d3a1914bb 100644 --- a/radio/sdcard/taranis-x9/SCRIPTS/snake.lua +++ b/radio/sdcard/taranis-x9/SCRIPTS/snake.lua @@ -127,7 +127,7 @@ local function run(event) raise("Cannot be run as a model script!") end - if event == EVT_EXIT_BREAK then + if event == EVT_VIRTUAL_EXIT then return 2 end diff --git a/radio/sdcard/taranis-x9/SxR Calibrate/SxR_Calibrate.lua b/radio/sdcard/taranis-x9/SxR Calibrate/SxR_Calibrate.lua index 5a03b1db0..a9c636f30 100644 --- a/radio/sdcard/taranis-x9/SxR Calibrate/SxR_Calibrate.lua +++ b/radio/sdcard/taranis-x9/SxR Calibrate/SxR_Calibrate.lua @@ -60,10 +60,10 @@ local function runWarningPage(event) 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) - if event == EVT_ENTER_BREAK then + if event == EVT_VIRTUAL_ENTER then selectPage(1) return 0 - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then return 2 end return 0 @@ -184,9 +184,9 @@ end -- Main local function runFieldsPage(event) - if event == EVT_EXIT_BREAK then -- exit script + if event == EVT_VIRTUAL_EXIT then -- exit script return 2 - elseif event == EVT_ENTER_BREAK then -- toggle editing/selecting current field + elseif event == EVT_VIRTUAL_ENTER then -- toggle editing/selecting current field if fields[current][4] ~= nil then edit = not edit if edit == false then @@ -194,15 +194,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 then + if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REP then addField(1) - elseif event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT or event == EVT_MINUS_REPT then + elseif event == EVT_VIRTUAL_PREV or event == EVT_VIRTUAL_PREV_REP then addField(-1) end else - if event == EVT_MINUS_FIRST or event == EVT_ROT_LEFT then + if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REP then selectField(1) - elseif event == EVT_PLUS_FIRST or event == EVT_ROT_RIGHT then + elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REP then selectField(-1) end end @@ -235,11 +235,11 @@ local function runCalibrationPage(event) lcd.drawPixmap(10, 19, "bmp/done.bmp") lcd.drawText(0, 56, "Press [Exit] when ready", attr) end - if calibrationStep > 6 and (event == EVT_ENTER_BREAK or event == EVT_EXIT_BREAK) then + if calibrationStep > 6 and (event == EVT_VIRTUAL_ENTER or event == EVT_VIRTUAL_EXIT) then return 2 - elseif event == EVT_ENTER_BREAK then + elseif event == EVT_VIRTUAL_ENTER then calibrationState = 1 - elseif event == EVT_EXIT_BREAK then + elseif event == EVT_VIRTUAL_EXIT then if calibrationStep > 0 then calibrationStep = 0 end @@ -261,9 +261,9 @@ local function run(event) if event == nil then error("Cannot be run as a model script!") return 2 - elseif event == EVT_PAGE_BREAK then + elseif event == EVT_VIRTUAL_NEXT_PAGE then selectPage(1) - elseif event == EVT_PAGE_LONG then + elseif event == EVT_VIRTUAL_PREV_PAGE then killEvents(event); selectPage(-1) end