[nv14] Fix key support in bootloader

Resolves #597
2021-08-17 14:32:04 +02:00
parent 89fde0f4bc
commit 478e345a32
2 changed files with 6 additions and 7 deletions
@@ -83,11 +83,10 @@ void interrupt10ms()
 #endif
  
  uint8_t index = 0;
-  uint8_t in = readKeys();
-  for (uint8_t i = 1; i != uint8_t(1u << TRM_BASE); i <<= 1) {
-    uint8_t value = (in & i);
-    keys[index].input(value);
-    ++index;
+  uint32_t in = readKeys();
+
+  for (int i = 0; i < TRM_BASE; i++) {
+    keys[index++].input(in & (1 << i));
  }

 #if defined(ROTARY_ENCODER_NAVIGATION)
@@ -146,9 +146,9 @@ enum EnumKeys
  KEY_PGDN,
  KEY_ENTER,
  KEY_MODEL,
-  KEY_UP = KEY_MODEL,
+  KEY_UP /*= KEY_MODEL*/,
  KEY_EXIT,
-  KEY_DOWN = KEY_EXIT,
+  KEY_DOWN /*= KEY_EXIT*/,
  KEY_TELEM,
  KEY_RIGHT = KEY_TELEM,
  KEY_RADIO,