Merge upstream changes from Marlin 2.1.1

2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions
--- a/Marlin/src/gcode/control/M997.cpp
+++ b/Marlin/src/gcode/control/M997.cpp
@@ -24,8 +24,8 @@

 #if ENABLED(PLATFORM_M997_SUPPORT)

-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
-  #include "../../lcd/e3v2/enhanced/dwin.h"
+#if ENABLED(DWIN_LCD_PROUI)
+  #include "../../lcd/e3v2/proui/dwin.h"
 #endif

 /**
@@ -33,7 +33,7 @@
 */
 void GcodeSuite::M997() {

-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen());
+  TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());

  flashFirmware(parser.intval('S'));