Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Differentiate between inc/dec and prev/next because of x9d(+) (#6890)

Browse source 
* Review virtual event to differentiate between prev/next and inc/dec

* Review scripts

* Replace VIRTUAL_PREVIOUS by VIRTUAL_PREV
This commit is contained in:
3djc 2019-10-04 08:39:31 +02:00 • committed by Bertrand Songis
parent 8ef57e2267
commit d9a035db11
16 changed files with 66 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/sdcard/horus/SCRIPTS/TOOLS/CROSSFIRE/crossfire.lua
View file

@ -91,7 +91,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectDevice(-1) selectDevice(-1)
end end

6
radio/sdcard/horus/SCRIPTS/TOOLS/CROSSFIRE/device.lua
View file

@ -455,15 +455,15 @@ local function runDevicePage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_INC then
incrField(1) incrField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_DEC then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/horus/SCRIPTS/TOOLS/FrSky GaSuite.lua
View file

@ -332,15 +332,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -500,7 +500,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

6
radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SBEC.lua
View file

@ -221,15 +221,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/horus/SCRIPTS/TOOLS/FrSky SxR.lua
View file

@ -268,15 +268,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -348,7 +348,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

2
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/CROSSFIRE/crossfire.lua
View file

@ -90,7 +90,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectDevice(-1) selectDevice(-1)
end end

4
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/CROSSFIRE/device.lua
View file

@ -452,13 +452,13 @@ local function runDevicePage(event)
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then
incrField(1) incrField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_PREV or event == EVT_VIRTUAL_PREV_REPT then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky GaSuite.lua
View file

@ -332,15 +332,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -500,7 +500,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

6
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky SBEC.lua
View file

@ -221,15 +221,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/taranis-x7/SCRIPTS/TOOLS/FrSky SxR.lua
View file

@ -268,15 +268,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -348,7 +348,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

2
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/CROSSFIRE/crossfire.lua
View file

@ -90,7 +90,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT then elseif event == EVT_VIRTUAL_NEXT then
selectDevice(1) selectDevice(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectDevice(-1) selectDevice(-1)
end end

6
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/CROSSFIRE/device.lua
View file

@ -450,15 +450,15 @@ local function runDevicePage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
incrField(1) incrField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
incrField(-1) incrField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky GaSuite.lua
View file

@ -332,15 +332,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -500,7 +500,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

6
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky SBEC.lua
View file

@ -221,15 +221,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end

8
radio/sdcard/taranis-x9/SCRIPTS/TOOLS/FrSky SxR.lua
View file

@ -268,15 +268,15 @@ local function runFieldsPage(event)
end end
end end
elseif edit then elseif edit then
if event == EVT_VIRTUAL_NEXT or event == EVT_VIRTUAL_NEXT_REPT then if event == EVT_VIRTUAL_INC or event == EVT_VIRTUAL_INC_REPT then
addField(1) addField(1)
elseif event == EVT_VIRTUAL_PREVIOUS or event == EVT_VIRTUAL_PREVIOUS_REPT then elseif event == EVT_VIRTUAL_DEC or event == EVT_VIRTUAL_DEC_REPT then
addField(-1) addField(-1)
end end
else else
if event == EVT_VIRTUAL_NEXT then if event == EVT_VIRTUAL_NEXT then
selectField(1) selectField(1)
elseif event == EVT_VIRTUAL_PREVIOUS then elseif event == EVT_VIRTUAL_PREV then
selectField(-1) selectField(-1)
end end
end end
@ -348,7 +348,7 @@ local function run(event)
return 2 return 2
elseif event == EVT_VIRTUAL_NEXT_PAGE then elseif event == EVT_VIRTUAL_NEXT_PAGE then
selectPage(1) selectPage(1)
elseif event == EVT_VIRTUAL_PREVIOUS_PAGE then elseif event == EVT_VIRTUAL_PREV_PAGE then
killEvents(event); killEvents(event);
selectPage(-1) selectPage(-1)
end end

31
radio/src/lua/api_general.cpp
View file

@ -1677,19 +1677,32 @@ const luaR_value_entry opentxConstants[] = {
// Virtual events // Virtual events
#if defined(ROTARY_ENCODER_NAVIGATION) #if defined(ROTARY_ENCODER_NAVIGATION)
{ "EVT_VIRTUAL_PREVIOUS", EVT_ROTARY_LEFT }, { "EVT_VIRTUAL_PREV", EVT_ROTARY_LEFT },
{ "EVT_VIRTUAL_PREVIOUS_REPT", EVT_ROTARY_LEFT },
{ "EVT_VIRTUAL_NEXT", EVT_ROTARY_RIGHT }, { "EVT_VIRTUAL_NEXT", EVT_ROTARY_RIGHT },
{ "EVT_VIRTUAL_NEXT_REPT", EVT_ROTARY_RIGHT }, { "EVT_VIRTUAL_DEC", EVT_ROTARY_LEFT },
{ "EVT_VIRTUAL_INC", EVT_ROTARY_RIGHT },
#elif defined(PCBX9D) || defined(PCBX9DP) // key reverted between field nav and value change
{ "EVT_VIRTUAL_PREV", EVT_KEY_FIRST(KEY_PLUS) },
{ "EVT_VIRTUAL_PREV_REPT", EVT_KEY_REPT(KEY_PLUS) },
{ "EVT_VIRTUAL_NEXT", EVT_KEY_FIRST(KEY_MINUS) },
{ "EVT_VIRTUAL_NEXT_REPT", EVT_KEY_REPT(KEY_MINUS) },
{ "EVT_VIRTUAL_DEC", EVT_KEY_FIRST(KEY_MINUS) },
{ "EVT_VIRTUAL_DEC_REPT", EVT_KEY_REPT(KEY_MINUS) },
{ "EVT_VIRTUAL_INC", EVT_KEY_FIRST(KEY_PLUS) },
{ "EVT_VIRTUAL_INC_REPT", EVT_KEY_REPT(KEY_PLUS) },
#else #else
{ "EVT_VIRTUAL_PREVIOUS", EVT_KEY_FIRST(KEY_LEFT) }, { "EVT_VIRTUAL_PREV", EVT_KEY_FIRST(KEY_LEFT) },
{ "EVT_VIRTUAL_PREVIOUS_REPT", EVT_KEY_REPT(KEY_LEFT) }, { "EVT_VIRTUAL_PREV_REPT", EVT_KEY_REPT(KEY_LEFT) },
{ "EVT_VIRTUAL_NEXT", EVT_KEY_FIRST(KEY_RIGHT) }, { "EVT_VIRTUAL_NEXT", EVT_KEY_FIRST(KEY_RIGHT) },
{ "EVT_VIRTUAL_NEXT_REPT", EVT_KEY_REPT(KEY_RIGHT) }, { "EVT_VIRTUAL_NEXT_REPT", EVT_KEY_REPT(KEY_RIGHT) },
{ "EVT_VIRTUAL_DEC", EVT_KEY_FIRST(KEY_LEFT) },
{ "EVT_VIRTUAL_DEC_REPT", EVT_KEY_REPT(KEY_LEFT) },
{ "EVT_VIRTUAL_INC", EVT_KEY_FIRST(KEY_RIGHT) },
{ "EVT_VIRTUAL_INC_REPT", EVT_KEY_REPT(KEY_RIGHT) },
#endif #endif
#if defined(NAVIGATION_9X) || defined(NAVIGATION_XLITE) #if defined(NAVIGATION_9X) || defined(NAVIGATION_XLITE)
{ "EVT_VIRTUAL_PREVIOUS_PAGE", EVT_KEY_LONG(KEY_UP) }, { "EVT_VIRTUAL_PREV_PAGE", EVT_KEY_LONG(KEY_UP) },
{ "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_UP) }, { "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_UP) },
{ "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_DOWN) }, { "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_DOWN) },
{ "EVT_VIRTUAL_MENU_LONG", EVT_KEY_LONG(KEY_DOWN) }, { "EVT_VIRTUAL_MENU_LONG", EVT_KEY_LONG(KEY_DOWN) },
@ -1697,7 +1710,7 @@ const luaR_value_entry opentxConstants[] = {
{ "EVT_VIRTUAL_ENTER_LONG", EVT_KEY_LONG(KEY_ENTER) }, { "EVT_VIRTUAL_ENTER_LONG", EVT_KEY_LONG(KEY_ENTER) },
{ "EVT_VIRTUAL_EXIT", EVT_KEY_BREAK(KEY_EXIT) }, { "EVT_VIRTUAL_EXIT", EVT_KEY_BREAK(KEY_EXIT) },
#elif defined(NAVIGATION_X7) || defined(NAVIGATION_X9D) #elif defined(NAVIGATION_X7) || defined(NAVIGATION_X9D)
{ "EVT_VIRTUAL_PREVIOUS_PAGE", EVT_KEY_LONG(KEY_PAGE) }, { "EVT_VIRTUAL_PREV_PAGE", EVT_KEY_LONG(KEY_PAGE) },
{ "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PAGE) }, { "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PAGE) },
{ "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_MENU) }, { "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_MENU) },
{ "EVT_VIRTUAL_MENU_LONG", EVT_KEY_LONG(KEY_MENU) }, { "EVT_VIRTUAL_MENU_LONG", EVT_KEY_LONG(KEY_MENU) },
@ -1706,10 +1719,10 @@ const luaR_value_entry opentxConstants[] = {
{ "EVT_VIRTUAL_EXIT", EVT_KEY_BREAK(KEY_EXIT) }, { "EVT_VIRTUAL_EXIT", EVT_KEY_BREAK(KEY_EXIT) },
#elif defined(NAVIGATION_HORUS) #elif defined(NAVIGATION_HORUS)
#if defined(KEYS_GPIO_REG_PGUP) #if defined(KEYS_GPIO_REG_PGUP)
{ "EVT_VIRTUAL_PREVIOUS_PAGE", EVT_KEY_BREAK(KEY_PGUP) }, { "EVT_VIRTUAL_PREV_PAGE", EVT_KEY_BREAK(KEY_PGUP) },
{ "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PGDN) }, { "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PGDN) },
#else #else
{ "EVT_VIRTUAL_PREVIOUS_PAGE", EVT_KEY_LONG(KEY_PGDN) }, { "EVT_VIRTUAL_PREV_PAGE", EVT_KEY_LONG(KEY_PGDN) },
{ "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PGDN) }, { "EVT_VIRTUAL_NEXT_PAGE", EVT_KEY_BREAK(KEY_PGDN) },
#endif #endif
{ "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_MODEL) }, { "EVT_VIRTUAL_MENU", EVT_KEY_BREAK(KEY_MODEL) },