From bff3e653fc2a9d0b3adee6b991516cea1b9bf43b Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Thu, 18 May 2023 15:21:22 +0200
Subject: [PATCH] Fix Colorlcd navigation

---
 radio/src/gui/colorlcd/model_select.cpp   | 2 +-
 radio/src/gui/colorlcd/radio_diagkeys.cpp | 2 +-
 radio/src/gui/colorlcd/tabsgroup.cpp      | 4 ++--
 radio/src/gui/colorlcd/view_main.cpp      | 4 ++--
 radio/src/lua/api_general.cpp             | 4 ++--
 radio/src/lua/lua_widget.cpp              | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_select.cpp b/radio/src/gui/colorlcd/model_select.cpp
index 6e86730ac..ff9986362 100644
--- a/radio/src/gui/colorlcd/model_select.cpp
+++ b/radio/src/gui/colorlcd/model_select.cpp
@@ -666,7 +666,7 @@ ModelLabelsWindow::ModelLabelsWindow() : Page(ICON_MODEL)
 #if defined(HARDWARE_KEYS)
 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) ||
       event == EVT_KEY_BREAK(KEY_PAGEDN)) {
 #else
diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio_diagkeys.cpp
index 4d953758d..55e3889c9 100644
--- a/radio/src/gui/colorlcd/radio_diagkeys.cpp
+++ b/radio/src/gui/colorlcd/radio_diagkeys.cpp
@@ -88,7 +88,7 @@ class RadioKeyDiagsWindow : public Window
         auto k = get_ith_key(i);
         y += FH;
         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)
       y += FH;
diff --git a/radio/src/gui/colorlcd/tabsgroup.cpp b/radio/src/gui/colorlcd/tabsgroup.cpp
index c57b97e64..6702ae9de 100644
--- a/radio/src/gui/colorlcd/tabsgroup.cpp
+++ b/radio/src/gui/colorlcd/tabsgroup.cpp
@@ -277,7 +277,7 @@ void TabsGroup::onEvent(event_t event)
 #if defined(HARDWARE_KEYS)
   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)) {
 #else
   if (event == EVT_KEY_BREAK(KEY_PAGEDN)) {
@@ -286,7 +286,7 @@ void TabsGroup::onEvent(event_t event)
     uint8_t current = header.carousel.getCurrentIndex() + 1;
     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
   else if (event == EVT_KEY_LONG(KEY_PAGEDN)) {
diff --git a/radio/src/gui/colorlcd/view_main.cpp b/radio/src/gui/colorlcd/view_main.cpp
index 4822f494c..6c95e337e 100644
--- a/radio/src/gui/colorlcd/view_main.cpp
+++ b/radio/src/gui/colorlcd/view_main.cpp
@@ -279,7 +279,7 @@ void ViewMain::onEvent(event_t event)
       new ScreenMenu();
       break;
 
-#if defined(KEYS_GPIO_REG_PAGEGUP)
+#if defined(KEYS_GPIO_REG_PAGEUP)
     case EVT_KEY_FIRST(KEY_PAGEDN):
 #else
     case EVT_KEY_BREAK(KEY_PAGEDN):
@@ -292,7 +292,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_PAGEGUP)
+#if defined(KEYS_GPIO_REG_PAGEUP)
     case EVT_KEY_FIRST(KEY_PAGEUP):
 #else
     case EVT_KEY_LONG(KEY_PAGEDN):
diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp
index 8eadd30f6..2bfc96bdb 100644
--- a/radio/src/lua/api_general.cpp
+++ b/radio/src/lua/api_general.cpp
@@ -3106,7 +3106,7 @@ LROT_BEGIN(etxcst, NULL, 0)
   LROT_NUMENTRY( EVT_VIRTUAL_ENTER_LONG, EVT_KEY_LONG(KEY_ENTER) )
   LROT_NUMENTRY( EVT_VIRTUAL_EXIT, EVT_KEY_BREAK(KEY_EXIT) )
 #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_NEXT_PAGE, EVT_KEY_BREAK(KEY_PAGEDN) )
 #elif defined(PCBNV14)
@@ -3157,7 +3157,7 @@ LROT_BEGIN(etxcst, NULL, 0)
   KEY_EVENTS(DOWN, KEY_DOWN)
 #endif
 
-#if defined(KEYS_GPIO_REG_PAGEGUP)
+#if defined(KEYS_GPIO_REG_PAGEUP)
   KEY_EVENTS(PAGEUP, KEY_PAGEUP)
 #endif
 
diff --git a/radio/src/lua/lua_widget.cpp b/radio/src/lua/lua_widget.cpp
index c6583fa69..4a7cc4530 100644
--- a/radio/src/lua/lua_widget.cpp
+++ b/radio/src/lua/lua_widget.cpp
@@ -175,7 +175,7 @@ void LuaEventHandler::onEvent(event_t event)
   if (event == EVT_KEY_LONG(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)) {
     killEvents(KEY_PAGEDN);
   }