Lua virtual replace (#7337)

This commit is contained in:
Carsten W
2020-01-27 15:10:46 +01:00
committed by 3djc
parent 3744e8e1ea
commit 23f16d039e
18 changed files with 128 additions and 143 deletions
@@ -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