From 1868db82aa3336c292db49b97e8b7473360f54d2 Mon Sep 17 00:00:00 2001
From: InsanityAutomation <d.menzel@insanityautomation.com>
Date: Sun, 13 Feb 2022 14:57:45 -0500
Subject: [PATCH] Cleanup

---
 Marlin/Configuration.h                        | 25 ++-----------------
 Marlin/Version.h                              |  2 ++
 .../src/lcd/extui/Creality/Creality_DWIN.cpp  | 10 +++-----
 Marlin/src/lcd/extui/Creality/Creality_DWIN.h | 12 ++++++++-
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index cc98e216ca..4e3ff4ba9a 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -379,7 +379,6 @@
   #if NONE(ABL_UBL, ABL_BI)
     #define ABL_BI
   #endif
-  #define BedDC
 #endif
 
 #if ENABLED(OriginalCrealitySquareBoard)
@@ -414,9 +413,6 @@
     #define ABL_BI
   #endif
   #define lerdgeFilSensor
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
 #if ENABLED(MachineCR10Max)
@@ -427,9 +423,6 @@
     #define ABL_BI
   #endif
   #define lerdgeFilSensor
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
 #if ENABLED(MachineEnder5Plus)
@@ -444,16 +437,10 @@
   #if DISABLED(ABL_UBL)
     #define ABL_BI
   #endif
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
-#if ANY(MachineCR10SV2, MachineCR10Smart)
+#if ANY(MachineCR10SV2)
   #define lerdgeFilSensor
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
 #if ANY(MachineCR10SV2, MachineCR10Max, MachineCR10SProV2) && ANY(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, ABL_TOUCH_MI) && NONE(SKR13, SKR14, SKR14Turbo, SKRPRO11)
@@ -524,16 +511,10 @@
 #if ENABLED(MachineCRX)
   #define MachineCR10Std
   #define Dual_BowdenSplitterY
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
 #if ANY(MachineEnder3V2, MachineEnder3Pro422, MachineEnder3Pro427, Creality422, Creality427, MachineEnder3Max, MachineEnder6, MachineEnder7, MachineSermoonD1)
   #define POWER_LOSS_RECOVERY //Screen will not compile without PLR
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
   #define CrealitySilentBoard
 #endif
 
@@ -598,9 +579,7 @@
     #define ABL_BI
   #endif
   #define SolidBedMounts
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
+
 #endif
 
 #if ENABLED(SKRPRO11)
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 4ee2df45eb..ffd4557794 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -132,6 +132,8 @@
  */
 #if(ENABLED(MachineMini))
   #define CUSTOM_MACHINE_NAME "Mini SuPeR"
+#elif(ENABLED(MachineCR10Smart))
+  #define CUSTOM_MACHINE_NAME "TM3D CR10Smart"
 #elif(ENABLED(MachineEnder2))
   #define CUSTOM_MACHINE_NAME "TM3D Ender2"
 #elif(ENABLED(MachineEnder3))
diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
index fd57e1f019..72c11b7bb8 100644
--- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
+++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.cpp
@@ -239,7 +239,7 @@ void onIdle()
 			if (AutohomeKey && isPositionKnown() && !commandsInQueue())
 			{ //Manual Move Home Done
         SERIAL_ECHOLNPGM_P(PSTR("==waitway 4=="));
-				//rtscheck.RTS_SndData(ExchangePageBase + 21 + AxisPagenum, ExchangepageAddr);
+				//rtscheck.RTS_SndData(ExchangePageBase + 71 + AxisPagenum, ExchangepageAddr);
 				AutohomeKey = false;
 				waitway = 0;
 			}
@@ -1425,8 +1425,8 @@ void RTSSHOW::RTS_HandleData()
               rtscheck.RTS_SndData(0, AutolevelVal + abl_probe_index * 2);
               ++abl_probe_index;
             }
-            RTS_SndData(ExchangePageBase + 85, ExchangepageAddr);
-            injectCommands_P(PSTR(MAIN_MENU_ITEM_1_GCODE));
+            RTS_SndData(ExchangePageBase + 64, ExchangepageAddr);
+            injectCommands_P(PSTR(MEASURING_GCODE));
           #endif
           break;
         }
@@ -1607,7 +1607,6 @@ void RTSSHOW::RTS_HandleData()
           injectCommands_P((PSTR("G28\nG1 F1000 Z10")));
           InforShowStatus = AutohomeKey = true;
           AutoHomeIconNum = 0;
-          //RTS_SndData(ExchangePageBase + 74, ExchangepageAddr);
           RTS_SndData(10, FilenameIcon);
         }
         else
@@ -2119,9 +2118,6 @@ void SetTouchScreenConfiguration() {
 
 void onPrinterKilled(FSTR_P const error, FSTR_P const component) {
   SERIAL_ECHOLNPGM_P(PSTR("***kill***"));
-  //First we send screen available on old versions of software
-	rtscheck.RTS_SndData(ExchangePageBase + 15, ExchangepageAddr);
-  //Then we send the new one Creality added in 1.70.1
 	rtscheck.RTS_SndData(ExchangePageBase + 88, ExchangepageAddr);
   int j = 0;
   char outmsg[40];
diff --git a/Marlin/src/lcd/extui/Creality/Creality_DWIN.h b/Marlin/src/lcd/extui/Creality/Creality_DWIN.h
index 36a7b98b5a..2502d3624a 100644
--- a/Marlin/src/lcd/extui/Creality/Creality_DWIN.h
+++ b/Marlin/src/lcd/extui/Creality/Creality_DWIN.h
@@ -271,6 +271,16 @@ void RTSInit();
 
 }
 #ifndef MAIN_MENU_ITEM_1_GCODE
-  #define MAIN_MENU_ITEM_1_GCODE "G28"
+  #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
+    #define MEASURING_GCODE "M190S55\nG28O\nG34\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM117 Set Z Offset"
+  #elif ENABLED(AUTO_BED_LEVELING_UBL)
+    #define MEASURING_GCODE "M190S55\nG28O\nG34\nG29P1\nG29P3\nG29S1\nG29S0\nG29F0.0\nG29A\nM104S215\nG28\nM109S215\nG1X150Y150F5000\nG1Z0\nM500\nM400\nM117 Set Z Offset"
+  #else
+    #define MEASURING_GCODE "G28"
+  #endif
+#else
+  #define MEASURING_GCODE MAIN_MENU_ITEM_1_GCODE
 #endif
+
+
 #endif