From d7a11222a83011b25f739c414878c891087e5e58 Mon Sep 17 00:00:00 2001
From: Knutwurst <36196269+knutwurst@users.noreply.github.com>
Date: Wed, 21 Apr 2021 11:12:34 +0200
Subject: [PATCH] Hotfix for BLTouch on Mega S and Mega X.

---
 Marlin/Configuration.h                  | 10 ++++------
 Marlin/Configuration_adv.h              |  8 ++++----
 Marlin/src/inc/Version.h                |  4 ++--
 Marlin/src/lcd/anycubic_touchscreen.cpp |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 967e179c..f85080a1 100755
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1130,10 +1130,8 @@
  * Use G29 repeatedly, adjusting the Z height at each point with movement commands
  * or (with LCD_BED_LEVELING) the LCD controller.
  */
-#if DISABLED(KNUTWURST_BLTOUCH)
-    #if DISABLED(KNUTWURST_TFT_LEVELING)
-      #define PROBE_MANUALLY
-    #endif
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+  #define PROBE_MANUALLY
 #endif
 
 //#define MANUAL_PROBE_START_Z 0.2
@@ -1652,7 +1650,7 @@
  *   leveling in steps so you can manually adjust the Z height at each grid-point.
  *   With an LCD controller the process is guided step-by-step.
  */
-#if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
     //#define AUTO_BED_LEVELING_3POINT
     //#define AUTO_BED_LEVELING_LINEAR
     #define AUTO_BED_LEVELING_BILINEAR
@@ -1831,7 +1829,7 @@
     #define HOMING_FEEDRATE_Z  (4*60)
 #endif
 
-#if ANY(KNUTWURST_MEGA_X, KNUTWURST_CHIRON)
+#if EITHER(KNUTWURST_MEGA_X, KNUTWURST_CHIRON)
     // Homing speeds (mm/m)
     #define HOMING_FEEDRATE_XY (40*60)
     #define HOMING_FEEDRATE_Z  (6*60)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 0f19461f..ae21f8ae 100755
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1579,10 +1579,10 @@
 
 #if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
   // Override the mesh area if the automatic (max) area is too large
-  #define MESH_MIN_X MESH_INSET
-  #define MESH_MIN_Y MESH_INSET
-  #define MESH_MAX_X X_BED_SIZE - (MESH_INSET)
-  #define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET)
+  //#define MESH_MIN_X MESH_INSET
+  //#define MESH_MIN_Y MESH_INSET
+  //#define MESH_MAX_X X_BED_SIZE - (MESH_INSET)
+  //#define MESH_MAX_Y Y_BED_SIZE - (MESH_INSET)
 #endif
 
 /**
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index 29454fb9..ec3daec1 100755
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -41,10 +41,10 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
- #define CUSTOM_BUILD_VERSION "1.2.0-beta.1"
+ #define CUSTOM_BUILD_VERSION "1.2.0-b1hotfix1"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2021-04-18"
+  #define STRING_DISTRIBUTION_DATE "2021-04-21"
 #endif
 
 /**
diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp
index def8b535..32bdeee2 100755
--- a/Marlin/src/lcd/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/anycubic_touchscreen.cpp
@@ -662,7 +662,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
     }
   #endif
 
-  #if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+  #if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
     else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL)
     || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL))
     {
@@ -937,7 +937,7 @@ void AnycubicTouchscreenClass::PrintList()
             break;
       #endif
 
-      #if ANY(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+      #if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
           case 4: // Page 2
             HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_S);
             HARDWARE_SERIAL_PROTOCOLLNPGM(SM_EZLVL_MENU_L);