From 00155509a38321088e0a7806baec77445f549f2c Mon Sep 17 00:00:00 2001
From: Knutwurst <36196269+knutwurst@users.noreply.github.com>
Date: Mon, 21 Jun 2021 15:48:48 +0200
Subject: [PATCH] Only home X after G29, play some beeping tones and save
 eeprom automatically. Also bump version for next release.

---
 Marlin/src/gcode/bedlevel/abl/G29.cpp   |  2 +-
 Marlin/src/inc/Version.h                |  2 +-
 Marlin/src/lcd/anycubic_touchscreen.cpp | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 486ce0aa..035a9d8b 100755
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -36,7 +36,7 @@
 #include "../../../module/probe.h"
 #include "../../queue.h"
 
-#ifdef KNUTWURST_TFT_LEVELING
+#if ENABLED(KNUTWURST_TFT_LEVELING)
     #include "../../../lcd/HardwareSerial.h"
 #endif
 
diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
index a8f9a9dc..89987bc4 100755
--- a/Marlin/src/inc/Version.h
+++ b/Marlin/src/inc/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
- #define CUSTOM_BUILD_VERSION "1.2.0-b_4.10"
+ #define CUSTOM_BUILD_VERSION "1.2.0-beta.5"
 
 #ifndef STRING_DISTRIBUTION_DATE
   #define STRING_DISTRIBUTION_DATE "2021-06-21"
diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp
index b4ce164c..d0fe123f 100755
--- a/Marlin/src/lcd/anycubic_touchscreen.cpp
+++ b/Marlin/src/lcd/anycubic_touchscreen.cpp
@@ -24,13 +24,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../module/configuration_store.h"
 #include "../gcode/queue.h"
 #include "../gcode/parser.h"
 #include "../feature/e_parser.h"
 #include "../feature/pause.h"
-#include "../feature/bedlevel/bedlevel.h"
-#include "../feature/bedlevel/abl/abl.h"
+#include "../module/configuration_store.h"
+
+#if ENABLED(KNUTWURST_TFT_LEVELING)
+    #include "../feature/bedlevel/bedlevel.h"
+    #include "../feature/bedlevel/abl/abl.h"
+#endif
+
 #include "../libs/buzzer.h"
 #include "../module/planner.h"
 #include "../module/printcounter.h"
@@ -2054,7 +2058,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
                   HARDWARE_SERIAL_ENTER();
                 }
                 if(CodeSeen('S') ) {
-                  queue.enqueue_now_P(PSTR("G28\nG29\nG28"));
+                  queue.enqueue_now_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84"));
                 }
               break;
               case 31: // A31 z-offset
@@ -2140,7 +2144,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT()
                   HARDWARE_SERIAL_ENTER();
                 }
                 if(CodeSeen('S') ) {
-                  queue.enqueue_now_P(PSTR("G28\nG29\nG28"));
+                  queue.enqueue_now_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84"));
                 }
             #endif