From f5cfc65c1dca5e77ded588a35a4c994b97f7d373 Mon Sep 17 00:00:00 2001
From: InsanityAutomation <d.menzel@insanityautomation.com>
Date: Sat, 3 Jul 2021 12:51:14 -0400
Subject: [PATCH] Ender6 BLTouch Fix

---
 Marlin/Configuration.h | 6 +++++-
 platformio.ini         | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 3d93b17fc7..b4c9b46947 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -536,6 +536,10 @@
   #define ABL_BI
 #endif
 
+#if ANY(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI) && NONE(ABL_UBL, ABL_BI)
+  #define ABL_BI
+#endif
+
 #if NONE(MeshFast, MeshStd, MeshFine, MeshExtreme)
   #define MeshStd
 #endif
@@ -1858,7 +1862,7 @@
  * The probe replaces the Z-MIN endstop and is used for Z homing.
  * (Automatically enables USE_PROBE_FOR_Z_HOMING.)
  */
-#if NONE(Creality422, Creality427) && DISABLED(Creality42XUseZMin)
+#if NONE(Creality422, Creality427, MachineEnder6) && DISABLED(Creality42XUseZMin)
   #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 #endif
 // Force the use of the probe for Z-axis homing
diff --git a/platformio.ini b/platformio.ini
index 3df23ae761..8f4ce19159 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2724,6 +2724,11 @@ platform        = ${common_stm32f1.platform}
 extends         = env:STM32F103RET6_creality_maple
 build_flags     = ${env:STM32F103RET6_creality_maple.build_flags}  -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY
 
+[env:Ender6_BLT_ZM]
+platform        = ${common_stm32f1.platform}
+extends         = env:STM32F103RET6_creality_maple
+build_flags     = ${env:STM32F103RET6_creality_maple.build_flags}  -DMachineEnder6 -DABL_BLTOUCH -DFORCE10SPRODISPLAY -DCreality42XUseZMin
+
 [env:CR6_452]
 platform        = ${common_stm32f1.platform}
 extends         = env:STM32F103RET6_creality_maple