Allow both encoder and ADC keypad (#13355)

2019-03-12 00:10:56 +01:00
parent 31ff7da7ac
commit 10c8c034bd
4 changed files with 16 additions and 11 deletions
--- a/Marlin/src/lcd/ultralcd.cpp
+++ b/Marlin/src/lcd/ultralcd.cpp
@@ -1073,15 +1073,15 @@ void MarlinUI::update() {
            | slow_buttons
          #endif
        ;
-
      #elif HAS_ADC_BUTTONS
-
        buttons = 0;
+      #endif
+
+      #if HAS_ADC_BUTTONS
        if (keypad_buttons == 0) {
          const uint8_t b = get_ADC_keyValue();
          if (WITHIN(b, 1, 8)) keypad_buttons = _BV(b - 1);
        }
-
      #endif

      #if HAS_SHIFT_ENCODER