From 33dd9e1477488500f4fe2bde770435b7405c5d96 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Fri, 25 May 2018 20:52:10 +0200 Subject: [PATCH 1/3] added support for X-Lite --- src/SCRIPTS/BF/events.lua | 8 ++++---- src/SCRIPTS/BF/radios.lua | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SCRIPTS/BF/events.lua b/src/SCRIPTS/BF/events.lua index c84f6c92..949ea754 100644 --- a/src/SCRIPTS/BF/events.lua +++ b/src/SCRIPTS/BF/events.lua @@ -9,7 +9,7 @@ return }, longPress = { enter = EVT_ENTER_LONG, - menu = EVT_MENU_LONG, + menu = EVT_MENU_LONG or EVT_UP_LONG }, repeatPress = { minus = EVT_MINUS_REPT, @@ -18,12 +18,12 @@ return release = { enter = EVT_ENTER_BREAK, exit = EVT_EXIT_BREAK, - menu = EVT_MENU_BREAK, + menu = EVT_MENU_BREAK or EVT_UP_BREAK, minus = EVT_MINUS_BREAK, plus = EVT_PLUS_BREAK }, dial = { - left = EVT_ROT_LEFT, - right = EVT_ROT_RIGHT + left = EVT_ROT_LEFT or EVT_LEFT_BREAK, + right = EVT_ROT_RIGHT or EVT_RIGHT_BREAK } } diff --git a/src/SCRIPTS/BF/radios.lua b/src/SCRIPTS/BF/radios.lua index 7f7cb8a8..871b6d9f 100644 --- a/src/SCRIPTS/BF/radios.lua +++ b/src/SCRIPTS/BF/radios.lua @@ -29,6 +29,7 @@ local supportedRadios = { ["x7"] = supportedPlatforms.x7, ["x7s"] = supportedPlatforms.x7, + ["xlite"] = supportedPlatforms.x7, ["x9d"] = supportedPlatforms.x9, ["x9d+"] = supportedPlatforms.x9, ["x9e"] = supportedPlatforms.x9, From 78f2967b96a8ffb11c9d0091367f1e0d4a00bc55 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 26 May 2018 11:51:49 +0200 Subject: [PATCH 2/3] =?UTF-8?q?added=20support=20for=20=E2=80=9Cprevious?= =?UTF-8?q?=20page=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Keys are now: - next page: DOWN - previous page: UP - pop-up menu: long DOWN --- src/SCRIPTS/BF/events.lua | 6 +++--- src/SCRIPTS/BF/ui.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SCRIPTS/BF/events.lua b/src/SCRIPTS/BF/events.lua index 949ea754..058709c9 100644 --- a/src/SCRIPTS/BF/events.lua +++ b/src/SCRIPTS/BF/events.lua @@ -5,11 +5,11 @@ return minus = EVT_MINUS_FIRST, plus = EVT_PLUS_FIRST, pageDown = EVT_PAGEDN_FIRST, - pageUp = EVT_PAGEUP_FIRST + pageUp = EVT_PAGEUP_FIRST or EVT_UP_BREAK }, longPress = { enter = EVT_ENTER_LONG, - menu = EVT_MENU_LONG or EVT_UP_LONG + menu = EVT_MENU_LONG or EVT_DOWN_LONG }, repeatPress = { minus = EVT_MINUS_REPT, @@ -18,7 +18,7 @@ return release = { enter = EVT_ENTER_BREAK, exit = EVT_EXIT_BREAK, - menu = EVT_MENU_BREAK or EVT_UP_BREAK, + menu = EVT_MENU_BREAK or EVT_DOWN_BREAK, minus = EVT_MINUS_BREAK, plus = EVT_PLUS_BREAK }, diff --git a/src/SCRIPTS/BF/ui.lua b/src/SCRIPTS/BF/ui.lua index 76f72127..2c470b37 100644 --- a/src/SCRIPTS/BF/ui.lua +++ b/src/SCRIPTS/BF/ui.lua @@ -282,7 +282,7 @@ function run_ui(event) if (event == userEvent.longPress.menu) then -- Taranis QX7 / X9 menuActive = 1 currentState = pageStatus.displayMenu - elseif userEvent.press.pageUp and (event == userEvent.longPress.enter) then -- Horus + elseif userEvent.press.pageDown and (event == userEvent.longPress.enter) then -- Horus menuActive = 1 killEnterBreak = 1 currentState = pageStatus.displayMenu From 018b271365d98c071e5c0b4821344ecb4c2d2cd4 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sat, 26 May 2018 20:22:05 +0200 Subject: [PATCH 3/3] new key mapping - RIGHT: next page - LEFT: previous page - UP: previous field / - - DOWN: next field / + - long RIGHT: menu --- src/SCRIPTS/BF/events.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SCRIPTS/BF/events.lua b/src/SCRIPTS/BF/events.lua index 058709c9..e66d14c4 100644 --- a/src/SCRIPTS/BF/events.lua +++ b/src/SCRIPTS/BF/events.lua @@ -5,11 +5,11 @@ return minus = EVT_MINUS_FIRST, plus = EVT_PLUS_FIRST, pageDown = EVT_PAGEDN_FIRST, - pageUp = EVT_PAGEUP_FIRST or EVT_UP_BREAK + pageUp = EVT_PAGEUP_FIRST or EVT_LEFT_BREAK }, longPress = { enter = EVT_ENTER_LONG, - menu = EVT_MENU_LONG or EVT_DOWN_LONG + menu = EVT_MENU_LONG or EVT_RIGHT_LONG }, repeatPress = { minus = EVT_MINUS_REPT, @@ -18,12 +18,12 @@ return release = { enter = EVT_ENTER_BREAK, exit = EVT_EXIT_BREAK, - menu = EVT_MENU_BREAK or EVT_DOWN_BREAK, + menu = EVT_MENU_BREAK or EVT_RIGHT_BREAK, minus = EVT_MINUS_BREAK, plus = EVT_PLUS_BREAK }, dial = { - left = EVT_ROT_LEFT or EVT_LEFT_BREAK, - right = EVT_ROT_RIGHT or EVT_RIGHT_BREAK + left = EVT_ROT_LEFT or EVT_UP_BREAK, + right = EVT_ROT_RIGHT or EVT_DOWN_BREAK } }