clarify

MarlinFirmware · Nov 20, 2023 · 9e862f8 · 9e862f8
1 parent cc17151
commit 9e862f8
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/Marlin/src/inc/MarlinConfigPre.h b/Marlin/src/inc/MarlinConfigPre.h
@@ -60,7 +60,3 @@
 #ifndef __MARLIN_DEPS__
   #include HAL_PATH(.., inc/Conditionals_adv.h)
 #endif
-
-#if ENABLED(DWIN_LCD_PROUI)
-  #include "../lcd/e3v2/proui/dwin_defines.h"
-#endif
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -2756,8 +2756,6 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
     #error "JD_TUNE_ITEM requires HAS_JUNCTION_DEVIATION."
   #elif ENABLED(ADVK_TUNE_ITEM) && DISABLED(LIN_ADVANCE)
     #error "ADVK_TUNE_ITEM requires LIN_ADVANCE."
-  #elif ENABLED(MESH_EDIT_MENU) && !HAS_MESH
-    #error "MESH_EDIT_MENU requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_UBL."
   #endif
 #endif
 

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -268,7 +268,7 @@ Menu *stepsMenu = nullptr;
 #endif
 #if HAS_MESH
   Menu *meshMenu = nullptr;
-  #if ENABLED(MESH_EDIT_MENU)
+  #if ENABLED(PROUI_MESH_EDIT_MENU)
     Menu *editMeshMenu = nullptr;
   #endif
 #endif
@@ -3952,7 +3952,7 @@ void drawStepsMenu() {
     void setBedLevT() { setPIntOnClick(MIN_BEDTEMP, MAX_BEDTEMP); }
   #endif
 
-  #if ENABLED(MESH_EDIT_MENU)
+  #if ENABLED(PROUI_MESH_EDIT_MENU)
     #define Z_OFFSET_MIN -3
     #define Z_OFFSET_MAX  3
 
@@ -4029,7 +4029,7 @@ void drawStepsMenu() {
         MENU_ITEM(ICON_UBLTiltGrid, MSG_UBL_TILT_MESH, onDrawMenuItem, ublMeshTilt);
         MENU_ITEM(ICON_UBLSmartFill, MSG_UBL_SMART_FILLIN, onDrawMenuItem, ublSmartFillMesh);
       #endif
-      #if ENABLED(MESH_EDIT_MENU)
+      #if ENABLED(PROUI_MESH_EDIT_MENU)
         MENU_ITEM(ICON_MeshReset, MSG_MESH_RESET, onDrawMenuItem, ResetMesh);
         MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu);
       #endif
@@ -4038,7 +4038,7 @@ void drawStepsMenu() {
     updateMenu(meshMenu);
   }
 
-  #if ENABLED(MESH_EDIT_MENU)
+  #if ENABLED(PROUI_MESH_EDIT_MENU)
     void drawEditMeshMenu() {
       if (!leveling_is_valid()) { LCD_MESSAGE(MSG_UBL_MESH_INVALID); return; }
       set_bed_leveling_enabled(false);

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/e3v2/proui/dwin.h
@@ -343,7 +343,7 @@ void drawStepsMenu();
 #endif
 #if HAS_MESH
   void drawMeshSetMenu();
-  #if ENABLED(MESH_EDIT_MENU)
+  #if ENABLED(PROUI_MESH_EDIT_MENU)
     void drawEditMeshMenu();
   #endif
 #endif

diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/e3v2/proui/dwin_defines.h
@@ -103,7 +103,7 @@
   #define ADVK_TUNE_ITEM      // Linear Advance item in Tune Menu
 #endif
 #if HAS_MESH
-  #define MESH_EDIT_MENU      // Add a menu to edit mesh points
+  #define PROUI_MESH_EDIT_MENU  // Add a menu to edit mesh points
 #endif
 
 #define HAS_GCODE_PREVIEW 1