fix: remove KEYS_GPIO_REG_DOWN, KEYS_GPIO_REG_MINUS and KEYS_GPIO_REG_PLUS

Author: raphaelcoeffic

radio/src/gui/common/stdlcd/radio_ghost_menu.cpp

@@ -38,26 +38,18 @@ void menuGhostModuleConfig(event_t event)
       moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;
       break;
 
-#if defined(ROTARY_ENCODER_NAVIGATION)
     case EVT_ROTARY_LEFT:
-#elif defined(KEYS_GPIO_REG_UP)
-      case EVT_KEY_BREAK(KEY_UP):
-#elif defined(KEYS_GPIO_REG_PLUS)
-      case EVT_KEY_BREAK(KEY_PLUS):
-#endif
+    case EVT_KEY_BREAK(KEY_UP):
+    case EVT_KEY_BREAK(KEY_PLUS):
       reusableBuffer.ghostMenu.buttonAction = GHST_BTN_JOYUP;
       reusableBuffer.ghostMenu.menuAction = GHST_MENU_CTRL_NONE;
       moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;
       audioKeyPress();
       break;
 
-#if defined(ROTARY_ENCODER_NAVIGATION)
     case EVT_ROTARY_RIGHT:
-#elif defined(KEYS_GPIO_REG_DOWN)
-      case EVT_KEY_BREAK(KEY_DOWN):
-#elif defined(KEYS_GPIO_REG_MINUS)
+    case EVT_KEY_BREAK(KEY_DOWN):
     case EVT_KEY_BREAK(KEY_MINUS):
-#endif
       reusableBuffer.ghostMenu.buttonAction = GHST_BTN_JOYDOWN;
       reusableBuffer.ghostMenu.menuAction = GHST_MENU_CTRL_NONE;
       moduleState[EXTERNAL_MODULE].counter = GHST_MENU_CONTROL;

radio/src/targets/simu/opentxsimulator.cpp

@@ -420,6 +420,8 @@ extern volatile uint32_t rotencDt;
 
 void OpenTxSimulator::rotaryEncoderEvent(int steps)
 {
+  if (steps == 0) return;
+
 #if defined(ROTARY_ENCODER_NAVIGATION) && !defined(USE_HATS_AS_KEYS)
   static uint32_t last_tick = 0;
   if (steps != 0) {
@@ -433,22 +435,14 @@ void OpenTxSimulator::rotaryEncoderEvent(int steps)
     last_tick = now;
   }
 #else
-  // TODO : this should probably be handled in the GUI
   int key;
-#if defined(PCBXLITE)
-  if (steps > 0)
-    key = KEY_DOWN;
-  else if (steps < 0)
-    key = KEY_UP;
-#elif defined(KEYS_GPIO_REG_PLUS) && defined(KEYS_GPIO_REG_MINUS)
-  if (steps > 0)
-    key = KEY_MINUS;
-  else if (steps < 0)
-    key = KEY_PLUS;
-  else
-#endif
-    // Should not happen but Clang complains that key is unset otherwise
-    return;
+  if (keysGetSupported() & ((1 << KEY_UP) | (1 << KEY_DOWN))) {
+    key = steps > 0 ? KEY_DOWN : KEY_UP;
+  } else if (keysGetSupported() & ((1 << KEY_PLUS) | (1 << KEY_MINUS))) {
+    key = steps > 0 ? KEY_MINUS : KEY_PLUS;
+  } else {
+    return; // not supposed to happen???
+  }
 
   setKey(key, 1);
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))