ProUI feature utilization / Misc. Fixes

Marlin/src/inc/MarlinConfigPre.h

@@ -60,3 +60,5 @@
 #ifndef __MARLIN_DEPS__
   #include HAL_PATH(.., inc/Conditionals_adv.h)
 #endif
+
+#include "../lcd/e3v2/proui/dwin_defines.h"

Marlin/src/inc/SanityCheck.h

@@ -2756,6 +2756,10 @@ 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."
+  #elif (SDSORT_GCODE == false) && ENABLED(MEDIASORT_MENU_ITEM)
+    #error "MEDIASORT_MENU_ITEM requires SDSORT_GCODE to be defined 'true'."
   #endif
 #endif
 

Marlin/src/lcd/e3v2/proui/dwin.h

@@ -39,13 +39,6 @@
   #include "../../../feature/leds/leds.h"
 #endif
 
-#if ANY(BABYSTEPPING, HAS_BED_PROBE)
-  #define HAS_ZOFFSET_ITEM 1
-  #if !HAS_BED_PROBE
-    #define JUST_BABYSTEP 1
-  #endif
-#endif
-
 namespace GET_LANG(LCD_LANGUAGE) {
   #define _MSG_PREHEAT(N) \
     LSTR MSG_PREHEAT_##N                  = _UxGT("Preheat ") PREHEAT_## N ##_LABEL; \
@@ -141,18 +134,25 @@ typedef struct {
   #if ENABLED(BAUD_RATE_GCODE)
     bool baud115K = false;
   #endif
-
-  bool fullManualTramming = false;
-  bool mediaSort = true;
+  #if ALL(LCD_BED_TRAMMING, HAS_BED_PROBE)
+    bool fullManualTramming = false;
+  #endif
+  #if ENABLED(MEDIASORT_MENU_ITEM)
+    bool mediaSort = true;
+  #endif
   bool mediaAutoMount = ENABLED(HAS_SD_EXTENDER);
   #if ALL(INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
     uint8_t zAfterHoming = DEF_Z_AFTER_HOMING;
   #endif
   #if ALL(LED_CONTROL_MENU, HAS_COLOR_LEDS)
     LEDColor ledColor = defColorLeds;
   #endif
-  bool adaptiveStepSmoothing = true;
-  bool enablePreview = true;
+  #if ENABLED(ADAPTIVE_STEP_SMOOTHING)
+    bool adaptiveStepSmoothing = true;
+  #endif
+  #if HAS_GCODE_PREVIEW
+    bool enablePreview = true;
+  #endif
 } hmi_data_t;
 
 extern hmi_data_t hmiData;

Marlin/src/lcd/e3v2/proui/dwin_defines.h

@@ -78,3 +78,36 @@
 #define DEF_BEDPIDT TERN(PREHEAT_1_TEMP_BED, PREHEAT_1_TEMP_HOTEND, 60)
 #define DEF_PIDCYCLES 5
 
+/**
+* ProUI Menu Options
+* Choose which feature you would like to Enable or Disable
+*/
+#if ENABLED(SDCARD_SORT_ALPHA)
+  #define MEDIASORT_MENU_ITEM
+  #if ENABLED(MEDIASORT_MENU_ITEM) && (SDSORT_GCODE == false)
+    // MEDIASORT_MENU_ITEM needs SDSORT_GCODE to be 'true'
+    #undef SDSORT_GCODE
+    #define SDSORT_GCODE true
+  #endif
+#endif
+#if ENABLED(HAS_FILAMENT_SENSOR)
+  #define RUNOUT_TUNE_ITEM
+#endif
+#if ENABLED(POWER_LOSS_RECOVERY)
+  #define PLR_TUNE_ITEM       // Power-loss Recovery option in Tune Menu
+#endif
+#if ENABLED(HAS_JUNCTION_DEVIATION)
+  #define JD_TUNE_ITEM        // Juntion Deviation item in Tune Menu
+#endif
+#if ENABLED(LIN_ADVANCE)
+  #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
+#endif
+
+#define HAS_GCODE_PREVIEW 1
+#define HAS_CUSTOM_COLORS 1   // Change display colors
+#define HAS_ESDIAG 1          // View End-stop/Runout switch continuity
+#define HAS_LOCKSCREEN 1      // Simple lockscreen
+#define HAS_SD_EXTENDER 1     // Enable to support SD card extender cables

ini/stm32f4.ini

@@ -733,7 +733,7 @@ debug_tool      = jlink
 upload_protocol = jlink
 
 [env:STM32F401RE_creality_stlink]
-extends         = env:STM32F401RC_creality
+extends         = env:STM32F401RE_creality
 debug_tool      = stlink
 upload_protocol = stlink