Skip to content

Commit

Permalink
Clean up Touch pins. Better up/down touch response. (#14900)
Browse files Browse the repository at this point in the history
  • Loading branch information
@robbycandra @thinkyhead
robbycandra authored and thinkyhead committed Aug 10, 2019
1 parent 8cc0b4b commit d2d71ca
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 24 deletions.
12 changes: 4 additions & 8 deletions Marlin/src/feature/touch/xpt2046.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ void XPT2046::init(void) {
uint8_t XPT2046::read_buttons() {
int16_t tsoffsets[4] = { 0 };

static uint32_t touchtimeout = 0;
if (PENDING(millis(), touchtimeout)) return 0;
touchtimeout = millis() + 80; // ideally want to set this lower for the games... 30 or 40.

if (tsoffsets[0] + tsoffsets[1] == 0) {
// Not yet set, so use defines as fallback...
tsoffsets[0] = XPT2046_X_CALIBRATION;
Expand All @@ -84,10 +80,10 @@ uint8_t XPT2046::read_buttons() {

if (y < 175 || y > 234) return 0;

if (WITHIN(x, 11, 109)) encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * ENCODER_PULSES_PER_STEP;
else if (WITHIN(x, 111, 209)) encoderDiff = ENCODER_STEPS_PER_MENU_ITEM * ENCODER_PULSES_PER_STEP;
else if (WITHIN(x, 211, 309)) return EN_C;
return 0;
return WITHIN(x, 11, 109) ? EN_A
: WITHIN(x, 111, 209) ? EN_B
: WITHIN(x, 211, 309) ? EN_C
: 0;
}

bool XPT2046::isTouched() {
Expand Down
46 changes: 39 additions & 7 deletions Marlin/src/lcd/ultralcd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -764,12 +764,42 @@ void MarlinUI::update() {

// If the action button is pressed...
static bool wait_for_unclick; // = 0
if (!external_control && button_pressed()) {
if (!wait_for_unclick) { // 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
if (touch_buttons) {
if (buttons & EN_C) {
if (!wait_for_unclick) { // 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 if (buttons & (EN_A | EN_B)) { // Ignore the encoder if clicked, to prevent "slippage"
const millis_t ms = millis();
if (ELAPSED(ms, next_button_update_ms)) {
next_button_update_ms = ms + 50;
encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * (ENCODER_PULSES_PER_STEP);
if (buttons & EN_A) encoderDiff *= -1;
if (!wait_for_unclick) {
next_button_update_ms += 250;
#if HAS_BUZZER
buzz(LCD_FEEDBACK_FREQUENCY_DURATION_MS, LCD_FEEDBACK_FREQUENCY_HZ);
#endif
wait_for_unclick = true; // - Set debounce flag to ignore continous clicks
}
}
}
}
else {
//
// Integrated LCD click handling via button_pressed()
//
if (!external_control && button_pressed()) {
if (!wait_for_unclick) { // 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 wait_for_unclick = false;
Expand All @@ -784,7 +814,9 @@ void MarlinUI::update() {
#endif // HAS_LCD_MENU

#if ENABLED(INIT_SDCARD_ON_BOOT)

//
// SPI SD Card detection (and first card init when the LCD is present)
//
const uint8_t sd_status = (uint8_t)IS_SD_INSERTED();
if (sd_status != lcd_sd_status && detected()) {

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/ultralcd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@

#define BUTTON_PRESSED(BN) !READ(BTN_## BN)

#if BUTTON_EXISTS(ENC)
#if BUTTON_EXISTS(ENC) || ENABLED(TOUCH_BUTTONS)
#define BLEN_C 2
#define EN_C _BV(BLEN_C)
#endif
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
// Touch support
//
#if ENABLED(TOUCH_BUTTONS)
#define BTN_ENC PA11 // Real pin needed to enable encoder's push button functionality used by touch screen. PA11 gives stable value.
#define TOUCH_CS_PIN PA4
#define TOUCH_INT_PIN PC4
#endif
4 changes: 0 additions & 4 deletions Marlin/src/pins/stm32/pins_LONGER3D_LK.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,6 @@
#define TOUCH_MOSI_PIN PB14 // pin 53
#define TOUCH_MISO_PIN PB15 // pin 54
#define TOUCH_INT_PIN PC6 // pin 63 (PenIRQ coming from ADS7843)

#define BTN_ENC PB0 // pin 35 unconnected pin on Alfawise. (PC13 to try)
#define BTN_EN1 -1 // Real pin is needed to enable encoder's push button
#define BTN_EN2 -1 // functionality used by touch screen
#endif

//
Expand Down
3 changes: 1 addition & 2 deletions Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@
#define LCD_BACKLIGHT_PIN PD13

#if ENABLED(TOUCH_BUTTONS)
#define BTN_ENC PB3 // Not connected. TODO: Replace this hack to enable button code
#define TOUCH_CS_PIN PC2
#endif
#endif
Expand All @@ -134,7 +133,7 @@
#define MOTOR_CURRENT_PWM_XY_PIN PA6
#define MOTOR_CURRENT_PWM_Z_PIN PA7
#define MOTOR_CURRENT_PWM_E_PIN PB0
#define MOTOR_CURRENT_PWM_RANGE 65535 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
#define MOTOR_CURRENT_PWM_RANGE 1500 // (255 * (1000mA / 65535)) * 257 = 1000 is equal 1.6v Vref in turn equal 1Amp
#define DEFAULT_PWM_MOTOR_CURRENT { 1030, 1030, 1030 } // 1.05Amp per driver, here is XY, Z and E. This values determined empirically.

// This is a kind of workaround in case native marlin "digipot" interface won't work.
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@
#define LCD_BACKLIGHT_PIN PD13

#if ENABLED(TOUCH_BUTTONS)
#define BTN_ENC PC13 // Not connected. TODO: Replace this hack to enable button code
#define TOUCH_CS_PIN PA7
#endif
#endif

4 comments on commit d2d71ca

@sl1pkn07
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fail build LPC1768

Compiling .pio/build/LPC1768/src/src/lcd/ultralcd.cpp.o
Marlin/src/lcd/ultralcd.cpp: In static member function 'static void MarlinUI::update()':
Marlin/src/lcd/ultralcd.cpp:767:9: error: 'touch_buttons' was not declared in this scope
     if (touch_buttons) {
         ^~~~~~~~~~~~~
Marlin/src/lcd/ultralcd.cpp:767:9: note: suggested alternative: 'buttons'
     if (touch_buttons) {
         ^~~~~~~~~~~~~
         buttons
Marlin/src/lcd/ultralcd.cpp:805:5: error: 'else' without a previous 'if'
     else wait_for_unclick = false;
     ^~~~
*** [.pio/build/LPC1768/src/src/lcd/ultralcd.cpp.o] Error 1

@kkberg
Copy link

@kkberg kkberg commented on d2d71ca Aug 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same issue. One commit before is running well.

@ellensp
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is larger than just LPC1768, just tried good old BOARD_RAMPS_14_EFB
Same error. Seems like any board if you enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER

@sl1pkn07
Copy link
Contributor

@sl1pkn07 sl1pkn07 commented on d2d71ca Aug 10, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mine with CR10_STOCKDISPLAY

BTW, fixed with #14912

Please sign in to comment.