From 57937704026ac7156eb2ae54a9b54a7c12f40ec0 Mon Sep 17 00:00:00 2001 From: robbycandra Date: Fri, 9 Aug 2019 21:27:55 +0700 Subject: [PATCH 01/13] Remove Touch Button Pin --- Marlin/src/lcd/ultralcd.h | 2 +- Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h | 2 +- Marlin/src/pins/stm32/pins_LONGER3D_LK.h | 2 +- Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h | 4 ++-- Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 2eb8c79f2fc3..60a111d1c4f0 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -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 diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h index 77730bc415da..6f776e3c8156 100644 --- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h +++ b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h @@ -122,7 +122,7 @@ // 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 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 diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h index 5be4eb57de1f..de9bce0fc4ec 100644 --- a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h +++ b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h @@ -137,7 +137,7 @@ #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_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 diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h index 0b1649d01765..c65ae62cc968 100755 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h @@ -125,7 +125,7 @@ #define LCD_BACKLIGHT_PIN PD13 #if ENABLED(TOUCH_BUTTONS) - #define BTN_ENC PB3 // Not connected. TODO: Replace this hack to enable button code + //#define BTN_ENC PB3 // Not connected. TODO: Replace this hack to enable button code #define TOUCH_CS_PIN PC2 #endif #endif @@ -134,7 +134,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. diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h index e2ca88e710ba..536d003f2642 100755 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h @@ -129,7 +129,7 @@ #define LCD_BACKLIGHT_PIN PD13 #if ENABLED(TOUCH_BUTTONS) - #define BTN_ENC PC13 // Not connected. TODO: Replace this hack to enable button code + //#define BTN_ENC PC13 // Not connected. TODO: Replace this hack to enable button code #define TOUCH_CS_PIN PA7 #endif #endif From 5af11e1133f12de5214477e36f3ce86e0f85b998 Mon Sep 17 00:00:00 2001 From: robbycandra Date: Sat, 10 Aug 2019 08:12:07 +0700 Subject: [PATCH 02/13] Further Touch Button update --- Marlin/src/feature/touch/xpt2046.cpp | 10 +++------- Marlin/src/lcd/ultralcd.cpp | 30 +++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp index 747659dc7c01..a8fd25fe53e3 100644 --- a/Marlin/src/feature/touch/xpt2046.cpp +++ b/Marlin/src/feature/touch/xpt2046.cpp @@ -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; @@ -84,9 +80,9 @@ 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; + if (WITHIN(x, 11, 109)) return EN_A; //encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * ENCODER_PULSES_PER_STEP; + if (WITHIN(x, 111, 209)) return EN_B; //encoderDiff = ENCODER_STEPS_PER_MENU_ITEM * ENCODER_PULSES_PER_STEP; + if (WITHIN(x, 211, 309)) return EN_C; return 0; } diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index cc196095d176..e623f2b47f19 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -764,7 +764,35 @@ void MarlinUI::update() { // If the action button is pressed... static bool wait_for_unclick; // = 0 - if (!external_control && button_pressed()) { + if (touch_buttons) { + if ((buttons & EN_A) || (buttons & EN_B)) { + if (ELAPSED(millis(), next_button_update_ms)) { + if (buttons & EN_A) + encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * ENCODER_PULSES_PER_STEP; + else + encoderDiff = ENCODER_STEPS_PER_MENU_ITEM * ENCODER_PULSES_PER_STEP; + + if (!wait_for_unclick) { + next_button_update_ms = millis() + 300; + #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 + next_button_update_ms = millis() + 50; + } + } + 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 (!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 From 5f430f8e8daaf75b4bfbe9473b8637c99624f287 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:04:54 -0500 Subject: [PATCH 03/13] Update ultralcd.cpp --- Marlin/src/lcd/ultralcd.cpp | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index e623f2b47f19..4a38c8f45d42 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -765,24 +765,6 @@ void MarlinUI::update() { // If the action button is pressed... static bool wait_for_unclick; // = 0 if (touch_buttons) { - if ((buttons & EN_A) || (buttons & EN_B)) { - if (ELAPSED(millis(), next_button_update_ms)) { - if (buttons & EN_A) - encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * ENCODER_PULSES_PER_STEP; - else - encoderDiff = ENCODER_STEPS_PER_MENU_ITEM * ENCODER_PULSES_PER_STEP; - - if (!wait_for_unclick) { - next_button_update_ms = millis() + 300; - #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 - next_button_update_ms = millis() + 50; - } - } 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 @@ -791,6 +773,21 @@ void MarlinUI::update() { 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 if (!external_control && button_pressed()) { if (!wait_for_unclick) { // If not waiting for a debounce release: From ad8784772bf2af1630bf6e062693d96725081dda Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:17:59 -0500 Subject: [PATCH 04/13] Update ultralcd.cpp --- Marlin/src/lcd/ultralcd.cpp | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index 4a38c8f45d42..a54bb9b368eb 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -777,7 +777,7 @@ void MarlinUI::update() { 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; + 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; @@ -789,12 +789,17 @@ void MarlinUI::update() { } } } - else 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 { + // + // 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; @@ -809,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()) { From 4de17019e3b5087dbcbdbb13f530717c9075a33c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:33:01 -0500 Subject: [PATCH 05/13] Update pins_MKS_ROBIN_NANO.h --- Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h index 536d003f2642..0561b5911391 100755 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h @@ -129,7 +129,7 @@ #define LCD_BACKLIGHT_PIN PD13 #if ENABLED(TOUCH_BUTTONS) - //#define BTN_ENC PC13 // Not connected. TODO: Replace this hack to enable button code + //#define BTN_ENC PC13 // Not connected. TODO: Replace this hack to enable button code #define TOUCH_CS_PIN PA7 #endif #endif From 5e9be0e189d3cf16c8a84bbf359d9feeb2e9af46 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:33:32 -0500 Subject: [PATCH 06/13] Update pins_MKS_ROBIN_MINI.h --- Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h index c65ae62cc968..64f6116896d1 100755 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h @@ -125,7 +125,7 @@ #define LCD_BACKLIGHT_PIN PD13 #if ENABLED(TOUCH_BUTTONS) - //#define BTN_ENC PB3 // Not connected. TODO: Replace this hack to enable button code + //#define BTN_ENC PB3 // Not connected. TODO: Replace this hack to enable button code #define TOUCH_CS_PIN PC2 #endif #endif From 96dca5b5ed78d2a76f0df2de46d8f02e31c9fac5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:33:55 -0500 Subject: [PATCH 07/13] Update pins_LONGER3D_LK.h --- Marlin/src/pins/stm32/pins_LONGER3D_LK.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h index de9bce0fc4ec..b1740b37e70e 100644 --- a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h +++ b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h @@ -137,7 +137,7 @@ #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_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 From 388e50b2fa58ceb65f9eb29b4908e7e5c9417d22 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:34:15 -0500 Subject: [PATCH 08/13] Update pins_JGAURORA_A5S_A1.h --- Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h index 6f776e3c8156..7f26af5c7232 100644 --- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h +++ b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h @@ -122,7 +122,7 @@ // 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 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 From fb31f36d3f5a1095a367fc2470898caf1256f846 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:36:51 -0500 Subject: [PATCH 09/13] Update xpt2046.cpp --- Marlin/src/feature/touch/xpt2046.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/src/feature/touch/xpt2046.cpp b/Marlin/src/feature/touch/xpt2046.cpp index a8fd25fe53e3..f920627c29c4 100644 --- a/Marlin/src/feature/touch/xpt2046.cpp +++ b/Marlin/src/feature/touch/xpt2046.cpp @@ -80,10 +80,10 @@ uint8_t XPT2046::read_buttons() { if (y < 175 || y > 234) return 0; - if (WITHIN(x, 11, 109)) return EN_A; //encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * ENCODER_PULSES_PER_STEP; - if (WITHIN(x, 111, 209)) return EN_B; //encoderDiff = ENCODER_STEPS_PER_MENU_ITEM * ENCODER_PULSES_PER_STEP; - 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() { From bf86ee5aa4ad078573113414ee29264610beada8 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:40:28 -0500 Subject: [PATCH 10/13] Update pins_MKS_ROBIN_NANO.h --- Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h index 0561b5911391..eb5d8a7362da 100755 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_NANO.h @@ -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 From 43e3fbec83f6a5c2978c52153c3ab683afc1dbae Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:40:55 -0500 Subject: [PATCH 11/13] Update pins_MKS_ROBIN_MINI.h --- Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h index 64f6116896d1..131ee4b02e3c 100755 --- a/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h +++ b/Marlin/src/pins/stm32/pins_MKS_ROBIN_MINI.h @@ -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 From fb97858738a82b17685f9d5b5d848e9cabcee489 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:41:30 -0500 Subject: [PATCH 12/13] Update pins_LONGER3D_LK.h --- Marlin/src/pins/stm32/pins_LONGER3D_LK.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h index b1740b37e70e..9c9806cb2fea 100644 --- a/Marlin/src/pins/stm32/pins_LONGER3D_LK.h +++ b/Marlin/src/pins/stm32/pins_LONGER3D_LK.h @@ -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 // From 42cb5c1f7f41ce52e928339fa73ab005e92cb4e5 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Aug 2019 01:41:49 -0500 Subject: [PATCH 13/13] Update pins_JGAURORA_A5S_A1.h --- Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h index 7f26af5c7232..e9a86e27c99c 100644 --- a/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h +++ b/Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h @@ -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