CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve touch buttons behavior (#16109)

Browse Source
This commit is contained in:
Tanguy Pruvot 2019-12-06 07:47:50 +01:00 committed by Scott Lahteine
parent a087a653cd
commit ab61c09bff
7 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View File

@ -290,7 +290,7 @@
#ifndef STD_ENCODER_PULSES_PER_STEP #ifndef STD_ENCODER_PULSES_PER_STEP
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
#define STD_ENCODER_PULSES_PER_STEP 1 #define STD_ENCODER_PULSES_PER_STEP 2
#else #else
#define STD_ENCODER_PULSES_PER_STEP 5 #define STD_ENCODER_PULSES_PER_STEP 5
#endif #endif

9
Marlin/src/lcd/menu/menu_main.cpp
View File

@ -106,7 +106,11 @@ void menu_main() {
SUBMENU(MSG_TUNE, menu_tune); SUBMENU(MSG_TUNE, menu_tune);
} }
else { else {
#if !HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT) #if !HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
// *** IF THIS SECTION IS CHANGED, REPRODUCE BELOW ***
// //
// Autostart // Autostart
// //
@ -134,6 +138,7 @@ void menu_main() {
ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr); ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
#endif #endif
} }
#endif // !HAS_ENCODER_WHEEL && SDSUPPORT #endif // !HAS_ENCODER_WHEEL && SDSUPPORT
#if MACHINE_CAN_PAUSE #if MACHINE_CAN_PAUSE
@ -197,6 +202,9 @@ void menu_main() {
#endif #endif
#if HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT) #if HAS_ENCODER_WHEEL && ENABLED(SDSUPPORT)
// *** IF THIS SECTION IS CHANGED, REPRODUCE ABOVE ***
// //
// Autostart // Autostart
// //
@ -224,6 +232,7 @@ void menu_main() {
ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr); ACTION_ITEM(MSG_MEDIA_RELEASED, nullptr);
#endif #endif
} }
#endif // HAS_ENCODER_WHEEL && SDSUPPORT #endif // HAS_ENCODER_WHEEL && SDSUPPORT
#if HAS_SERVICE_INTERVALS #if HAS_SERVICE_INTERVALS

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

@ -200,6 +200,7 @@ millis_t MarlinUI::next_button_update_ms; // = 0
#endif #endif
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
uint8_t MarlinUI::touch_buttons;
uint8_t MarlinUI::repeat_delay; uint8_t MarlinUI::repeat_delay;
#endif #endif
@ -778,58 +779,46 @@ void MarlinUI::update() {
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
#define TOUCH_MENU_MASK 0x80 if (touch_buttons) {
RESET_STATUS_TIMEOUT();
static bool arrow_pressed; // = false if (buttons & (EN_A | EN_B)) { // Menu arrows, in priority
if (ELAPSED(ms, next_button_update_ms)) {
// 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?
encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP) * encoderDirection; encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP) * encoderDirection;
if (touch_buttons & EN_A) encoderDiff *= -1; if (buttons & EN_A) encoderDiff *= -1;
next_button_update_ms = ms + repeat_delay; // Assume the repeat delay next_button_update_ms = ms + repeat_delay; // Assume the repeat delay
if (!wait_for_unclick && !arrow_pressed) { // On click prepare for repeat if (!wait_for_unclick) {
next_button_update_ms += 250; // Longer delay on first press next_button_update_ms += 250; // Longer delay on first press
arrow_pressed = true; // Mark arrow as pressed wait_for_unclick = true; // Avoid Back/Select click while repeating
#if HAS_BUZZER #if HAS_BUZZER
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ); buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#endif #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 #endif // TOUCH_BUTTONS
// Integrated LCD click handling via button_pressed {
if (!external_control && button_pressed()) { // Integrated LCD click handling via button_pressed
if (!wait_for_unclick) { // If not waiting for a debounce release: if (!external_control && button_pressed()) {
wait_for_unclick = true; // - Set debounce flag to ignore continous clicks if (!wait_for_unclick) { // If not waiting for a debounce release:
lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
wait_for_user = false; // - Any click clears wait for user lcd_clicked = !wait_for_user && !no_reentry; // - Keep the click if not waiting for a user-click
quick_feedback(); // - Always make a click sound wait_for_user = false; // - Any click clears wait for user
quick_feedback(); // - Always make a click sound
}
}
else
wait_for_unclick = false;
} }
}
else
wait_for_unclick = false;
if (LCD_BACK_CLICKED()) { if (LCD_BACK_CLICKED()) {
quick_feedback(); quick_feedback();
@ -894,8 +883,13 @@ void MarlinUI::update() {
next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL; next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
if (on_status_screen())
next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2; if (on_status_screen()) next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
#if HAS_ENCODER_ACTION
touch_buttons = touch.read_buttons();
#endif
#endif #endif
#if ENABLED(LCD_HAS_STATUS_INDICATORS) #if ENABLED(LCD_HAS_STATUS_INDICATORS)
@ -1249,6 +1243,9 @@ void MarlinUI::update() {
#if HAS_SLOW_BUTTONS #if HAS_SLOW_BUTTONS
| slow_buttons | slow_buttons
#endif #endif
#if ENABLED(TOUCH_BUTTONS) && HAS_ENCODER_ACTION
| touch_buttons
#endif
); );
#elif HAS_ADC_BUTTONS #elif HAS_ADC_BUTTONS

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

@ -27,10 +27,10 @@
#include "../libs/buzzer.h" #include "../libs/buzzer.h"
#endif #endif
#define HAS_DIGITAL_BUTTONS (!HAS_ADC_BUTTONS && ENABLED(NEWPANEL) || BUTTON_EXISTS(EN1, EN2) || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT))
#define HAS_SHIFT_ENCODER (!HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL))))
#define HAS_ENCODER_WHEEL ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTON_EXISTS(EN1, EN2))
#define HAS_ENCODER_ACTION (HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY)) #define HAS_ENCODER_ACTION (HAS_LCD_MENU || ENABLED(ULTIPANEL_FEEDMULTIPLY))
#define HAS_ENCODER_WHEEL ((!HAS_ADC_BUTTONS && ENABLED(NEWPANEL)) || BUTTON_EXISTS(EN1, EN2))
#define HAS_DIGITAL_BUTTONS (HAS_ENCODER_WHEEL || ANY_BUTTON(ENC, BACK, UP, DWN, LFT, RT))
#define HAS_SHIFT_ENCODER (!HAS_ADC_BUTTONS && (ENABLED(REPRAPWORLD_KEYPAD) || (HAS_SPI_LCD && DISABLED(NEWPANEL))))
// I2C buttons must be read in the main thread // I2C buttons must be read in the main thread
#define HAS_SLOW_BUTTONS EITHER(LCD_I2C_VIKI, LCD_I2C_PANELOLU2) #define HAS_SLOW_BUTTONS EITHER(LCD_I2C_VIKI, LCD_I2C_PANELOLU2)
@ -425,6 +425,7 @@ public:
#if HAS_LCD_MENU #if HAS_LCD_MENU
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
static uint8_t touch_buttons;
static uint8_t repeat_delay; static uint8_t repeat_delay;
#endif #endif

2
config/examples/Alfawise/U20-bltouch/Configuration.h
View File

@ -2139,7 +2139,7 @@
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
#define TOUCH_CALIBRATION // Include user calibration widget in menus (Alfawise) #define TOUCH_CALIBRATION // Include user calibration widget in menus (Alfawise)
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens #define BUTTON_DELAY_EDIT 75 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 100 // (ms) Button repeat delay for menus #define BUTTON_DELAY_MENU 100 // (ms) Button repeat delay for menus
#if ENABLED(TS_V11) #if ENABLED(TS_V11)

2
config/examples/Alfawise/U20/Configuration.h
View File

@ -2138,7 +2138,7 @@
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
#define TOUCH_CALIBRATION // Include user calibration widget in menus (Alfawise) #define TOUCH_CALIBRATION // Include user calibration widget in menus (Alfawise)
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens #define BUTTON_DELAY_EDIT 75 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 100 // (ms) Button repeat delay for menus #define BUTTON_DELAY_MENU 100 // (ms) Button repeat delay for menus
#if ENABLED(TS_V11) #if ENABLED(TS_V11)

4
config/examples/Mks/Robin/Configuration.h
View File

@ -2059,8 +2059,8 @@
// //
#define TOUCH_BUTTONS #define TOUCH_BUTTONS
#if ENABLED(TOUCH_BUTTONS) #if ENABLED(TOUCH_BUTTONS)
#define BUTTON_DELAY_EDIT 50 // (ms) Button repeat delay for edit screens #define BUTTON_DELAY_EDIT 75 // (ms) Button repeat delay for edit screens
#define BUTTON_DELAY_MENU 250 // (ms) Button repeat delay for menus #define BUTTON_DELAY_MENU 100 // (ms) Button repeat delay for menus
/* MKS Robin TFT v2.0 */ /* MKS Robin TFT v2.0 */
#define XPT2046_X_CALIBRATION 12013 #define XPT2046_X_CALIBRATION 12013