Skip to content

Commit

Permalink
Fix screen click reading too often
Browse files Browse the repository at this point in the history
See #19051

Co-Authored-By: andreibobirica <39415547+andreibobirica@users.noreply.github.com>
  • Loading branch information
thinkyhead and andreibobirica committed Oct 12, 2020
1 parent e7838c5 commit 32d3a7a
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Marlin/src/lcd/ultralcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1553,20 +1553,23 @@ void MarlinUI::update() {
// - On edit screens, touch Up Half for -, Bottom Half to +
//
void MarlinUI::screen_click(const uint8_t row, const uint8_t col, const uint8_t, const uint8_t) {
const millis_t now = millis();
if (PENDING(now, next_button_update_ms)) return;
next_button_update_ms = now + repeat_delay; // Assume the repeat delay
const int8_t xdir = col < (LCD_WIDTH ) / 2 ? -1 : 1,
ydir = row < (LCD_HEIGHT) / 2 ? -1 : 1;
if (on_edit_screen)
encoderDiff = epps * ydir;
else if (screen_items > 0) {
// Last 3 cols act as a scroll :-)
// Last 5 cols act as a scroll :-)
if (col > (LCD_WIDTH) - 5)
// 2 * LCD_HEIGHT to scroll to bottom of next page. (LCD_HEIGHT would only go 1 item down.)
encoderDiff = epps * (encoderLine - encoderTopLine + 2 * (LCD_HEIGHT)) * ydir;
else
encoderDiff = epps * (row - encoderPosition + encoderTopLine);
}
else if (!on_status_screen())
encoderDiff = epps * xdir;
encoderDiff = epps * xdir * 2;
}

#endif
Expand Down

0 comments on commit 32d3a7a

Please sign in to comment.