Merge branch 'CrealityDwin2.0_Bleeding' into F1rstLayer_Touchscreens

Marlin/Configuration.h

@@ -381,7 +381,6 @@
   #if NONE(ABL_UBL, ABL_BI)
     #define ABL_BI
   #endif
-  #define BedDC
 #endif
 
 #if ENABLED(OriginalCrealitySquareBoard)
@@ -416,9 +415,6 @@
     #define ABL_BI
   #endif
   #define lerdgeFilSensor
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
 #if ENABLED(MachineCR10Max)
@@ -429,9 +425,6 @@
     #define ABL_BI
   #endif
   #define lerdgeFilSensor
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
 #endif
 
 #if ENABLED(MachineEnder5Plus)
@@ -446,16 +439,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)
@@ -526,16 +513,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
 
@@ -600,9 +581,7 @@
     #define ABL_BI
   #endif
   #define SolidBedMounts
-  #if NONE(BedAC, BedDC)
-    #define BedDC
-  #endif
+
 #endif
 
 #if ENABLED(SKRPRO11)

Marlin/Configuration_adv.h

@@ -368,7 +368,7 @@
 #endif
 
 #if ANY(THERMAL_PROTECTION_HOTENDS, THERMAL_PROTECTION_BED, THERMAL_PROTECTION_CHAMBER, THERMAL_PROTECTION_COOLER)
-  #define THERMAL_PROTECTION_VARIANCE_MONITOR     // Detect a sensor malfunction preventing temperature updates
+  //#define THERMAL_PROTECTION_VARIANCE_MONITOR     // Detect a sensor malfunction preventing temperature updates
 #endif
 
 #if ENABLED(PIDTEMP)

Marlin/Version.h

@@ -137,7 +137,9 @@
 #endif
 
 #if(ENABLED(MachineMini))
-  #define CUSTOM_MACHINE_NAME "Mini"
+  #define CUSTOM_MACHINE_NAME "Mini SuPeR"
+#elif(ENABLED(MachineCR10Smart))
+  #define CUSTOM_MACHINE_NAME "CR10Smart"
 #elif(ENABLED(MachineEnder2))
   #define CUSTOM_MACHINE_NAME "Ender2"
 #elif(ENABLED(MachineEnder3))

Marlin/src/inc/Conditionals_post.h

@@ -459,7 +459,7 @@
 
 #endif
 
-#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI) || !PIN_EXISTS(SD_DETECT)
+#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI) || !PIN_EXISTS(SD_DETECT)
   #define NO_LCD_REINIT 1  // Suppress LCD re-initialization
 #endif
 

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];
@@ -2226,7 +2222,8 @@ void onPrintTimerStarted()
 void onPrintTimerPaused()
 {
 	SERIAL_ECHOLNPGM_P(PSTR("==onPrintTimerPaused=="));
-	rtscheck.RTS_SndData(ExchangePageBase + 87, ExchangepageAddr); //Display Pause Screen
+	rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr); //Display Pause Screen
+  onStatusChanged("Pausing...");
 }
 void onPrintTimerStopped()
 {
@@ -2316,29 +2313,29 @@ void onUserConfirmRequired(const char *const msg)
 
     case PAUSE_MESSAGE_PARKING:
     {
-      rtscheck.RTS_SndData(ExchangePageBase + 87, ExchangepageAddr);
+      rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr);
       onStatusChanged("Parking...");
       break;
     }
     case PAUSE_MESSAGE_CHANGING:{
-      rtscheck.RTS_SndData(ExchangePageBase + 87, ExchangepageAddr);
+      rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr);
       onStatusChanged("Beginning Filament Change");
       break;
     }
     case PAUSE_MESSAGE_UNLOAD:{
-      rtscheck.RTS_SndData(ExchangePageBase + 87, ExchangepageAddr);
+      rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr);
       onStatusChanged("Unloading...");
       break;
     }
     case PAUSE_MESSAGE_LOAD:{
-      rtscheck.RTS_SndData(ExchangePageBase + 87, ExchangepageAddr);
+      rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr);
       onStatusChanged("Reloading...");
       break;
     }
     case PAUSE_MESSAGE_RESUME:
     #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE)
       case PAUSE_MESSAGE_PURGE:{
-        rtscheck.RTS_SndData(ExchangePageBase + 87, ExchangepageAddr);
+        rtscheck.RTS_SndData(ExchangePageBase + 78, ExchangepageAddr);
         onStatusChanged("Press Yes to Stop Purge");
         break;
       }

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

Marlin/src/lcd/marlinui.cpp

@@ -1694,7 +1694,7 @@ void MarlinUI::init() {
       }
     }
 
-    #if PIN_EXISTS(SD_DETECT) && DISABLED(NO_LCD_REINIT)
+    #if PIN_EXISTS(SD_DETECT) && DISABLED(NO_LCD_REINIT) && DISABLED(EXTENSIBLE_UI)
       init_lcd(); // Revive a noisy shared SPI LCD
     #endif
 

Marlin/src/pins/stm32f1/pins_CREALITY_V45x.h

@@ -112,4 +112,5 @@
 // Misc. Functions
 //
 #define CASE_LIGHT_PIN                      PA6
+
 #define LED_PIN                             PA6

platformio.ini

@@ -117,6 +117,7 @@ extra_configs =
     ini/stm32h7.ini
     ini/stm32g0.ini
     ini/teensy.ini
+    ini/renamed.ini
 
 #
 # The 'common' section applies to most Marlin builds.