Update - plot graph -scroll, popups

classicrocker883 · Aug 27, 2024 · b970c42 · b970c42
1 parent 1d6c746
commit b970c42
Show file tree

Hide file tree

Showing 33 changed files with 192 additions and 239 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -3473,7 +3473,7 @@
   #define PROUI_EX 1            // Extended UI features (15152 bytes of flash)
   //#define CV_LASER_MODULE
   #define HAS_GCODE_PREVIEW 1
-  #define DISABLE_TUNING_GRAPH 0// Temp plot graph - PID/MPC Tuning (1624 bytes of flash)
+  #define DISABLE_TUNING_GRAPH 0// PID/MPC Tuning Plot Graph (1624 bytes of flash)
   #define HAS_ESDIAG 1          // View End-stop switch continuity (560 bytes of flash)
   //#define HAS_CGCODE 1        // Extra Gcode options (3320 bytes of flash)
   //#define HAS_LOCKSCREEN 1    // Simple lockscreen as to not accidentally change something (568 bytes of flash)
@@ -3484,9 +3484,7 @@
   #if ENABLED(BLTOUCH)
     #define HS_MENU_ITEM        // BLTOUCH_HS_MODE menu option (56 bytes of flash)
   #endif
-  #if DISABLED(DISABLE_TUNING_GRAPH)
-    #define PROUI_ITEM_PLOT     // Temperature Plot Graph item in Tune/Prepare Menu (688 bytes of flash)
-  #endif
+  #define PROUI_ITEM_PLOT       // Temp Plot Graph item in Tune/Prepare Menu (688 bytes of flash)
   //#define PROUI_ITEM_PLR      // Power-loss Recovery option in Tune Menu (POWER_LOSS_RECOVERY 3400 bytes of flash)
   //#define PROUI_ITEM_JD       // Juntion Deviation item in Tune Menu (only if JD is enabled)
   #define PROUI_ITEM_ADVK       // Linear Advance item in Tune Menu (only if LA is enabled)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -2918,8 +2918,8 @@ static_assert(NUM_SERVOS <= NUM_SERVO_PLUGS, "NUM_SERVOS (or some servo index) i
     #error "PROUI_ITEM_JD requires HAS_JUNCTION_DEVIATION."
   #elif ENABLED(PROUI_ITEM_ADVK) && DISABLED(LIN_ADVANCE)
     #error "PROUI_ITEM_ADVK requires LIN_ADVANCE."
-  #elif ENABLED(PROUI_ITEM_PLOT) && DISABLED(PROUI_TUNING_GRAPH)
-    #error "PROUI_ITEM_PLOT requires PROUI_TUNING_GRAPH."
+  #elif (ENABLED(PROUI_ITEM_PLOT) || PROUI_TUNING_GRAPH) && NONE(PIDTEMP, MPCTEMP, PIDTEMPBED, PIDTEMPCHAMBER)
+    #error "PROUI_ITEM_PLOT or PROUI_TUNING_GRAPH requires PIDTEMP, MPCTEMP, PIDTEMPBED, or PIDTEMPCHAMBER."
   #elif ENABLED(LCD_BED_TRAMMING) && DISABLED(BED_TRAMMING_INSET_LFRB)
     #error "BED_TRAMMING_INSET_LFRB must be defined with LCD_BED_TRAMMING."
   #endif

diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -103,8 +103,7 @@ void BedLevelToolsClass::manual_value_update(const uint8_t mesh_x, const uint8_t
 void BedLevelToolsClass::manual_move(const uint8_t mesh_x, const uint8_t mesh_y, bool zmove/*=false*/) {
   gcode.process_subcommands_now(F("G28O"));
   if (!zmove) {
-    DWIN_Show_Popup(ICON_BLTouch, F("Moving to Point"), F("Please wait until done."));
-    HMI_SaveProcessID(NothingToDo);
+    DWIN_Draw_Popup(ICON_BLTouch, F("Moving to Point"), F("Please wait until done."));
     gcode.process_subcommands_now(TS(F("G0F600Z"), p_float_t(Z_CLEARANCE_BETWEEN_PROBES, 3))); //gcode.process_subcommands_now(F("G0F600Z" STRINGIFY(Z_CLEARANCE_BETWEEN_PROBES)));
     gcode.process_subcommands_now(TS(F("G42F4000I"), mesh_x, F("J"), mesh_y));
   }