option to disable tuning graph

MarlinFirmware · Jan 17, 2023 · 0d7c5e0 · mriscoc · Jan 17, 2023 · 0d7c5e0
1 parent a91fb9c
commit 0d7c5e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -2510,8 +2510,8 @@
   #if EITHER(PIDTEMP, PIDTEMPBED)
     #define DWIN_PID_TUNE 1
   #endif
-  #if EITHER(DWIN_PID_TUNE, MPCTEMP)
-    #define HAS_PIDPLOT 1
+  #if EITHER(DWIN_PID_TUNE, MPCTEMP) && DISABLED(DISABLE_TUNING_GRAPH)
+    #define SHOW_TUNING_GRAPH 1
   #endif
 #endif
 

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -111,7 +111,7 @@
   #include "endstop_diag.h"
 #endif
 
-#if HAS_PIDPLOT
+#if SHOW_TUNING_GRAPH
   #include "plot.h"
 #endif
 
@@ -1247,7 +1247,7 @@ void EachMomentUpdate() {
     #if HAS_ESDIAG
       if (checkkey == ESDiagProcess) ESDiag.Update();
     #endif
-    #if HAS_PIDPLOT
+    #if SHOW_TUNING_GRAPH
       if (checkkey == PidProcess) plot.Update((HMI_value.pidresult == PIDTEMP_START) ? thermalManager.wholeDegHotend(0) : thermalManager.wholeDegBed());
     #endif
   }
@@ -1472,7 +1472,7 @@ void DWIN_LevelingDone() {
 
 // PID/MPC process
 
-#if HAS_PIDPLOT && EITHER(DWIN_PID_TUNE, MPCTEMP)
+#if SHOW_TUNING_GRAPH && EITHER(DWIN_PID_TUNE, MPCTEMP)
 
   #include "plot.h"
 
@@ -1527,7 +1527,7 @@ void DWIN_LevelingDone() {
     DWINUI::Draw_Int(HMI_data.PopupTxt_Color, 3, gfrm.x + 90, gfrm.y - DWINUI::fontHeight() - 4, _target);
   }
 
-#endif // HAS_PIDPLOT && (DWIN_PID_TUNE || MPCTEMP)
+#endif // SHOW_TUNING_GRAPH && (DWIN_PID_TUNE || MPCTEMP)
 
 #if DWIN_PID_TUNE
 
@@ -1548,7 +1548,7 @@ void DWIN_LevelingDone() {
       #if ENABLED(PIDTEMP)
         case PIDTEMP_START:
           HMI_SaveProcessID(PidProcess);
-          #if HAS_PIDPLOT
+          #if SHOW_TUNING_GRAPH
             DWIN_Draw_PID_MPC_Popup();
           #else
             DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for Nozzle is running."));
@@ -1562,7 +1562,7 @@ void DWIN_LevelingDone() {
       #if ENABLED(PIDTEMPBED)
         case PIDTEMPBED_START:
           HMI_SaveProcessID(PidProcess);
-          #if HAS_PIDPLOT
+          #if SHOW_TUNING_GRAPH
             DWIN_Draw_PID_MPC_Popup();
           #else
             DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_PID_AUTOTUNE), F("for BED is running."));
@@ -1596,7 +1596,7 @@ void DWIN_LevelingDone() {
     switch (result) {
       case MPCTEMP_START:
         HMI_SaveProcessID(MPCProcess);
-        #if HAS_PIDPLOT
+        #if SHOW_TUNING_GRAPH
           DWIN_Draw_PID_MPC_Popup();
         #else
           DWIN_Draw_Popup(ICON_TempTooHigh, GET_TEXT_F(MSG_MPC_AUTOTUNE), F("for Nozzle is running."));

diff --git a/Marlin/src/lcd/e3v2/proui/plot.cpp b/Marlin/src/lcd/e3v2/proui/plot.cpp
@@ -29,7 +29,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if BOTH(DWIN_LCD_PROUI, HAS_PIDPLOT)
+#if BOTH(DWIN_LCD_PROUI, SHOW_TUNING_GRAPH)
 
 #include "plot.h"
 #include "../../../core/types.h"
@@ -61,7 +61,7 @@ void PlotClass::Draw(const frame_rect_t &frame, const celsius_t max, const_float
 
 void PlotClass::Update(const_float_t value) {
   if (!scale) return;
-  uint16_t y = round((y2) - value * scale);
+  const uint16_t y = round((y2) - value * scale);
   if (grphpoints < grphframe.w) {
     DWIN_Draw_Point(Color_Yellow, 1, 1, grphpoints + grphframe.x, y);
   }
@@ -74,4 +74,4 @@ void PlotClass::Update(const_float_t value) {
   grphpoints++;
 }
 
-#endif // DWIN_LCD_PROUI && HAS_PIDPLOT
+#endif // DWIN_LCD_PROUI && SHOW_TUNING_GRAPH