piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

change to short i.e. first

Browse Source 
correct DGUP to PGUP (thx to raphaelcoeffic)
This commit is contained in:
olliw42
2021-05-24 16:52:38 +02:00
committed by Raphael Coeffic
parent a186ba2fdc
commit 09630ed4ff
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/tabsgroup.cpp
+5 -5
View File
@@ -169,8 +169,8 @@ void TabsGroup::onEvent(event_t event)
{
TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString().c_str(), event);
#if defined(KEYS_GPIO_REG_DGUP)
if (event == EVT_KEY_BREAK(KEY_PGDN) || event == EVT_KEY_LONG(KEY_PGDN)) {
#if defined(KEYS_GPIO_REG_PGUP)
if (event == EVT_KEY_FIRST(KEY_PGDN)) {
#else
if (event == EVT_KEY_BREAK(KEY_PGDN)) {
#endif
@@ -178,8 +178,8 @@ void TabsGroup::onEvent(event_t event)
uint8_t current = header.carousel.getCurrentIndex() + 1;
setCurrentTab(current >= tabs.size() ? 0 : current);
}
#if defined(KEYS_GPIO_REG_DGUP)
else if (event == EVT_KEY_BREAK(KEY_PGUP) || event == EVT_KEY_LONG(KEY_PGUP)) {
#if defined(KEYS_GPIO_REG_PGUP)
else if (event == EVT_KEY_FIRST(KEY_PGUP)) {
#else
else if (event == EVT_KEY_LONG(KEY_PGDN)) {
#endif
@@ -187,7 +187,7 @@ void TabsGroup::onEvent(event_t event)
uint8_t current = header.carousel.getCurrentIndex();
setCurrentTab(current == 0 ? tabs.size() - 1 : current - 1);
}
else if (event == EVT_KEY_LONG(KEY_EXIT) || event == EVT_KEY_BREAK(KEY_EXIT)) {
else if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event);
ViewMain::instance()->setFocus(SET_FOCUS_DEFAULT);
deleteLater();
radio/src/gui/colorlcd/view_main.cpp
+8 -8
View File
@@ -257,29 +257,30 @@ bool ViewMain::onTouchEnd(coord_t x, coord_t y)
void ViewMain::onEvent(event_t event)
{
switch (event) {
case EVT_KEY_LONG(KEY_MODEL):
case EVT_KEY_FIRST(KEY_MODEL):
killEvents(event);
new ModelMenu();
break;
case EVT_KEY_LONG(KEY_RADIO):
case EVT_KEY_FIRST(KEY_RADIO):
killEvents(event);
new RadioMenu();
break;
case EVT_KEY_LONG(KEY_TELEM):
case EVT_KEY_FIRST(KEY_TELEM):
killEvents(event);
new ScreenMenu();
break;
case EVT_KEY_LONG(KEY_ENTER):
case EVT_KEY_FIRST(KEY_ENTER):
killEvents(event);
openMenu();
break;
case EVT_KEY_BREAK(KEY_PGDN):
#if defined(KEYS_GPIO_REG_PGUP)
case EVT_KEY_LONG(KEY_PGDN):
case EVT_KEY_FIRST(KEY_PGDN):
#else
case EVT_KEY_BREAK(KEY_PGDN):
#endif
killEvents(event);
nextMainView();
@@ -288,8 +289,7 @@ void ViewMain::onEvent(event_t event)
//TODO: these need to go away!
// -> board code should map the keys as required
#if defined(KEYS_GPIO_REG_PGUP)
case EVT_KEY_BREAK(KEY_PGUP):
case EVT_KEY_LONG(KEY_PGUP):
case EVT_KEY_FIRST(KEY_PGUP):
#else
case EVT_KEY_LONG(KEY_PGDN):
#endif