Allow both encoder and ADC keypad (#13355)

This commit is contained in:
7eggert authored and Scott Lahteine committed 2019-03-11 18:10:56 -05:00
1 parent 31ff7da7ac
commit 10c8c034bd
4 files changed
+16 -11

No files matched your search

+3 -3
View File
@@ -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