Fix Colorlcd navigation
This commit is contained in:
@@ -666,7 +666,7 @@ ModelLabelsWindow::ModelLabelsWindow() : Page(ICON_MODEL)
|
|||||||
#if defined(HARDWARE_KEYS)
|
#if defined(HARDWARE_KEYS)
|
||||||
void ModelLabelsWindow::onEvent(event_t event)
|
void ModelLabelsWindow::onEvent(event_t event)
|
||||||
{
|
{
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
if (event == EVT_KEY_BREAK(KEY_PAGEUP) ||
|
if (event == EVT_KEY_BREAK(KEY_PAGEUP) ||
|
||||||
event == EVT_KEY_BREAK(KEY_PAGEDN)) {
|
event == EVT_KEY_BREAK(KEY_PAGEDN)) {
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ class RadioKeyDiagsWindow : public Window
|
|||||||
auto k = get_ith_key(i);
|
auto k = get_ith_key(i);
|
||||||
y += FH;
|
y += FH;
|
||||||
dc->drawText(KEY_COLUMN, y, keysGetLabel(k), COLOR_THEME_PRIMARY1);
|
dc->drawText(KEY_COLUMN, y, keysGetLabel(k), COLOR_THEME_PRIMARY1);
|
||||||
displayKeyState(dc, 70, y, i);
|
displayKeyState(dc, 70, y, k);
|
||||||
}
|
}
|
||||||
#if defined(ROTARY_ENCODER_NAVIGATION)
|
#if defined(ROTARY_ENCODER_NAVIGATION)
|
||||||
y += FH;
|
y += FH;
|
||||||
|
|||||||
@@ -277,7 +277,7 @@ void TabsGroup::onEvent(event_t event)
|
|||||||
#if defined(HARDWARE_KEYS)
|
#if defined(HARDWARE_KEYS)
|
||||||
TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString().c_str(), event);
|
TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString().c_str(), event);
|
||||||
|
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
if (event == EVT_KEY_FIRST(KEY_PAGEDN)) {
|
if (event == EVT_KEY_FIRST(KEY_PAGEDN)) {
|
||||||
#else
|
#else
|
||||||
if (event == EVT_KEY_BREAK(KEY_PAGEDN)) {
|
if (event == EVT_KEY_BREAK(KEY_PAGEDN)) {
|
||||||
@@ -286,7 +286,7 @@ void TabsGroup::onEvent(event_t event)
|
|||||||
uint8_t current = header.carousel.getCurrentIndex() + 1;
|
uint8_t current = header.carousel.getCurrentIndex() + 1;
|
||||||
setCurrentTab(current >= tabs.size() ? 0 : current);
|
setCurrentTab(current >= tabs.size() ? 0 : current);
|
||||||
}
|
}
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
else if (event == EVT_KEY_FIRST(KEY_PAGEUP)) {
|
else if (event == EVT_KEY_FIRST(KEY_PAGEUP)) {
|
||||||
#else
|
#else
|
||||||
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
|
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ void ViewMain::onEvent(event_t event)
|
|||||||
new ScreenMenu();
|
new ScreenMenu();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
case EVT_KEY_FIRST(KEY_PAGEDN):
|
case EVT_KEY_FIRST(KEY_PAGEDN):
|
||||||
#else
|
#else
|
||||||
case EVT_KEY_BREAK(KEY_PAGEDN):
|
case EVT_KEY_BREAK(KEY_PAGEDN):
|
||||||
@@ -292,7 +292,7 @@ void ViewMain::onEvent(event_t event)
|
|||||||
|
|
||||||
//TODO: these need to go away!
|
//TODO: these need to go away!
|
||||||
// -> board code should map the keys as required
|
// -> board code should map the keys as required
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
case EVT_KEY_FIRST(KEY_PAGEUP):
|
case EVT_KEY_FIRST(KEY_PAGEUP):
|
||||||
#else
|
#else
|
||||||
case EVT_KEY_LONG(KEY_PAGEDN):
|
case EVT_KEY_LONG(KEY_PAGEDN):
|
||||||
|
|||||||
@@ -3106,7 +3106,7 @@ LROT_BEGIN(etxcst, NULL, 0)
|
|||||||
LROT_NUMENTRY( EVT_VIRTUAL_ENTER_LONG, EVT_KEY_LONG(KEY_ENTER) )
|
LROT_NUMENTRY( EVT_VIRTUAL_ENTER_LONG, EVT_KEY_LONG(KEY_ENTER) )
|
||||||
LROT_NUMENTRY( EVT_VIRTUAL_EXIT, EVT_KEY_BREAK(KEY_EXIT) )
|
LROT_NUMENTRY( EVT_VIRTUAL_EXIT, EVT_KEY_BREAK(KEY_EXIT) )
|
||||||
#elif defined(COLORLCD)
|
#elif defined(COLORLCD)
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
LROT_NUMENTRY( EVT_VIRTUAL_PREV_PAGE, EVT_KEY_BREAK(KEY_PAGEUP) )
|
LROT_NUMENTRY( EVT_VIRTUAL_PREV_PAGE, EVT_KEY_BREAK(KEY_PAGEUP) )
|
||||||
LROT_NUMENTRY( EVT_VIRTUAL_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGEDN) )
|
LROT_NUMENTRY( EVT_VIRTUAL_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGEDN) )
|
||||||
#elif defined(PCBNV14)
|
#elif defined(PCBNV14)
|
||||||
@@ -3157,7 +3157,7 @@ LROT_BEGIN(etxcst, NULL, 0)
|
|||||||
KEY_EVENTS(DOWN, KEY_DOWN)
|
KEY_EVENTS(DOWN, KEY_DOWN)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(KEYS_GPIO_REG_PAGEGUP)
|
#if defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
KEY_EVENTS(PAGEUP, KEY_PAGEUP)
|
KEY_EVENTS(PAGEUP, KEY_PAGEUP)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ void LuaEventHandler::onEvent(event_t event)
|
|||||||
if (event == EVT_KEY_LONG(KEY_EXIT)) {
|
if (event == EVT_KEY_LONG(KEY_EXIT)) {
|
||||||
killEvents(KEY_EXIT);
|
killEvents(KEY_EXIT);
|
||||||
}
|
}
|
||||||
#if !defined(KEYS_GPIO_REG_PAGEGUP)
|
#if !defined(KEYS_GPIO_REG_PAGEUP)
|
||||||
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
|
else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
|
||||||
killEvents(KEY_PAGEDN);
|
killEvents(KEY_PAGEDN);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user