bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Touch-select MarlinUI menu items (#18239)

Browse Source
This commit is contained in:
Victor
2020-06-11 18:13:52 -03:00
committed by GitHub
parent fe969ec6d3
commit c6f3511d84
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/src/lcd/ultralcd.cpp
View File

@ -1438,6 +1438,29 @@ void MarlinUI::update() {
#endif
#if ENABLED(TOUCH_BUTTONS)
//
// Screen Click
// - On menu screens move directly to the touched item
// - On menu screens, right side (last 3 cols) acts like a scroll - half up => prev page, half down = next page
// - On select screens (and others) touch the Right Half for +, Left Half for -
//
void MarlinUI::screen_click(const uint8_t row, const uint8_t col, const uint8_t x, const uint8_t y) {
if (screen_items > 0) {
//last 3 cols act as a scroll :-)
if (col > (LCD_WIDTH) - 3)
//2 * LCD_HEIGHT to scroll to bottom of next page. If we did 1 * LCD_HEIGHT, it just go 1 item down
encoderDiff = ENCODER_PULSES_PER_STEP * (encoderLine - encoderTopLine + 2 * (LCD_HEIGHT)) * (row < (LCD_HEIGHT) / 2 ? -1 : 1);
else
encoderDiff = ENCODER_PULSES_PER_STEP * (row - encoderPosition + encoderTopLine);
}
else if (!on_status_screen())
encoderDiff = ENCODER_PULSES_PER_STEP * (col < (LCD_WIDTH) / 2 ? -1 : 1);
}
#endif
#else // !HAS_DISPLAY
//

4
Marlin/src/lcd/ultralcd.h
View File

@ -417,6 +417,10 @@ public:
static void draw_hotend_status(const uint8_t row, const uint8_t extruder);
#endif
#if ENABLED(TOUCH_BUTTONS)
static void screen_click(const uint8_t row, const uint8_t col, const uint8_t x, const uint8_t y);
#endif
static void status_screen();
#endif