From 62ba799d72daabb585da5b2b4ff67d45130c7061 Mon Sep 17 00:00:00 2001
From: Gurmeet Athwal <gurmeet.athwal@gmail.com>
Date: Sun, 25 Oct 2020 06:11:52 +0530
Subject: [PATCH] Add 'BTN_ENC_EN' for SKR V1.4 with DOGM (#19796)

---
 Marlin/src/lcd/marlinui.cpp                 | 12 ++++++++++--
 Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h |  5 +++++
 Marlin/src/pins/pinsDebug_list.h            |  3 +++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index 487678eccf..9c456c25c9 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -337,6 +337,10 @@ void MarlinUI::init() {
       SET_INPUT_PULLUP(BTN_ENC);
     #endif
 
+    #if BUTTON_EXISTS(ENC_EN)
+      SET_INPUT_PULLUP(BTN_ENC_EN);
+    #endif
+
     #if BUTTON_EXISTS(BACK)
       SET_INPUT_PULLUP(BTN_BACK);
     #endif
@@ -957,7 +961,10 @@ void MarlinUI::update() {
 
           #endif // ENCODER_RATE_MULTIPLIER
 
-          encoderPosition += (encoderDiff * encoderMultiplier) / epps;
+          // Update position only when ENC_EN is HIGH
+          if (TERN1(BTN_ENC_EN, !BUTTON_PRESSED(ENC_EN)))
+            encoderPosition += (encoderDiff * encoderMultiplier) / epps;
+
           encoderDiff = 0;
         }
 
@@ -1175,7 +1182,8 @@ void MarlinUI::update() {
             if (BUTTON_PRESSED(EN2)) newbutton |= EN_B;
           #endif
           #if BUTTON_EXISTS(ENC)
-            if (BUTTON_PRESSED(ENC)) newbutton |= EN_C;
+            // Update button only when ENC_EN is HIGH
+            if (TERN1(BTN_ENC_EN, !BUTTON_PRESSED(ENC_EN)) && BUTTON_PRESSED(ENC)) newbutton |= EN_C;
           #endif
           #if BUTTON_EXISTS(BACK)
             if (BUTTON_PRESSED(BACK)) newbutton |= EN_D;
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index f2afc23bc2..2b8682aac7 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -399,6 +399,11 @@
         #define LCD_PINS_D5                P1_21
         #define LCD_PINS_D6                P1_22
         #define LCD_PINS_D7                P1_23
+
+        #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
+          #define BTN_ENC_EN         LCD_PINS_D7  // Detect the presence of the encoder
+        #endif
+
       #endif
 
     #endif // !FYSETC_MINI_12864
diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h
index 704f2a487f..cf839e2abd 100644
--- a/Marlin/src/pins/pinsDebug_list.h
+++ b/Marlin/src/pins/pinsDebug_list.h
@@ -147,6 +147,9 @@
 #if defined(BTN_EN2) && BTN_EN2 >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_EN2)
 #endif
+#if defined(BTN_ENC_EN) && BTN_ENC_EN >= 0
+  REPORT_NAME_DIGITAL(__LINE__, BTN_ENC_EN)
+#endif
 #if defined(BTN_ENC) && BTN_ENC >= 0
   REPORT_NAME_DIGITAL(__LINE__, BTN_ENC)
 #endif