Skip to content

Commit

Permalink
Partial revert of "TOUCH_BUTTONS (MarlinFirmware#15100)" v8
Browse files Browse the repository at this point in the history
The new changes in Marlin make the touchscreen erratic.
Keep the "inverted" arrows for REVERSE_MENU_DIRECTION

Partially reverts/fix commit 6b05d5d.

- STD_ENCODER_PULSES_PER_STEP 1 make weird menu "rollback" on "untouch"
- touch_buttons variable seems required to avoid bad points for now..

+ handle arrows in priority
may avoid some bad clicks, but doesnt really change things..
  • Loading branch information
tpruvot committed Dec 2, 2019
1 parent 0c8ad06 commit 6d86d4f
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 33 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/inc/Conditionals_LCD.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@

#ifndef STD_ENCODER_PULSES_PER_STEP
#if ENABLED(TOUCH_BUTTONS)
#define STD_ENCODER_PULSES_PER_STEP 1
#define STD_ENCODER_PULSES_PER_STEP 2
#else
#define STD_ENCODER_PULSES_PER_STEP 5
#endif
Expand Down
55 changes: 23 additions & 32 deletions Marlin/src/lcd/ultralcd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
#endif

#if ENABLED(TOUCH_BUTTONS)
uint8_t MarlinUI::touch_buttons;
uint8_t MarlinUI::repeat_delay;
#endif

Expand Down Expand Up @@ -777,46 +778,30 @@ void MarlinUI::update() {
static bool wait_for_unclick; // = false

#if ENABLED(TOUCH_BUTTONS)

#define TOUCH_MENU_MASK 0x80

static bool arrow_pressed; // = false

// Handle touch events which are slow to read
if (ELAPSED(ms, next_button_update_ms)) {
uint8_t touch_buttons = touch.read_buttons();
if (touch_buttons) {
RESET_STATUS_TIMEOUT();
if (touch_buttons & TOUCH_MENU_MASK) { // Processing Menu Area touch?
if (!wait_for_unclick) { // If not waiting for a debounce release:
wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
wait_for_user = false; // - Any click clears wait for user
// TODO for next PR.
//uint8_t tpos = touch_buttons & ~(TOUCH_MENU_MASK); // Safe 7bit touched screen coordinate
next_button_update_ms = ms + 500; // Defer next check for 1/2 second
#if HAS_LCD_MENU
refresh();
#endif
}
touch_buttons = 0; // Swallow the touch
}
buttons |= (touch_buttons & (EN_C | EN_D)); // Pass on Click and Back buttons
if (touch_buttons & (EN_A | EN_B)) { // A and/or B button?
if (touch_buttons) {
RESET_STATUS_TIMEOUT();
if (buttons & (EN_A | EN_B)) { // Menu arrows, in priority
if (ELAPSED(ms, next_button_update_ms)) {
encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP) * encoderDirection;
if (touch_buttons & EN_A) encoderDiff *= -1;
next_button_update_ms = ms + repeat_delay; // Assume the repeat delay
if (!wait_for_unclick && !arrow_pressed) { // On click prepare for repeat
next_button_update_ms += 250; // Longer delay on first press
arrow_pressed = true; // Mark arrow as pressed
if (buttons & EN_A) encoderDiff *= -1;
next_button_update_ms = ms + repeat_delay; // Assume the repeat delay
if (!wait_for_unclick) {
next_button_update_ms += 250; // Longer delay on first press
wait_for_unclick = true; // Avoid Back/Select click while repeating
#if HAS_BUZZER
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#endif
}
}
}
if (!(touch_buttons & (EN_A | EN_B))) arrow_pressed = false;
else if (!wait_for_unclick && (buttons & EN_C)) { // OK button, if not waiting for a debounce release:
wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click
wait_for_user = false; // - Any click clears wait for user
quick_feedback(); // - Always make a click sound
}
}

else // keep wait_for_unclick value
#endif // TOUCH_BUTTONS

// Integrated LCD click handling via button_pressed
Expand Down Expand Up @@ -896,6 +881,9 @@ void MarlinUI::update() {
#if ENABLED(TOUCH_BUTTONS)
if (on_status_screen())
next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
#if HAS_LCD_MENU
touch_buttons = touch.read_buttons();
#endif
#endif

#if ENABLED(LCD_HAS_STATUS_INDICATORS)
Expand Down Expand Up @@ -1249,6 +1237,9 @@ void MarlinUI::update() {
#if HAS_SLOW_BUTTONS
| slow_buttons
#endif
#if HAS_LCD_MENU && ENABLED(TOUCH_BUTTONS)
| touch_buttons
#endif
);

#elif HAS_ADC_BUTTONS
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/lcd/ultralcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ class MarlinUI {
#if HAS_LCD_MENU

#if ENABLED(TOUCH_BUTTONS)
static uint8_t touch_buttons;
static uint8_t repeat_delay;
#endif

Expand Down

0 comments on commit 6d86d4f

Please sign in to comment.