MarlinFirmware · thinkyhead · Mar 20, 2025 · Aug 17, 2023 · Aug 17, 2023 · Aug 17, 2023
diff --git a/Marlin/src/gcode/calibrate/M48.cpp b/Marlin/src/gcode/calibrate/M48.cpp
@@ -261,8 +261,7 @@ void GcodeSuite::M48() {
 
     #if HAS_STATUS_MESSAGE
       // Display M48 results in the status bar
-      char sigma_str[8];
-      ui.status_printf(0, F(S_FMT ": %s"), GET_TEXT(MSG_M48_DEVIATION), dtostrf(sigma, 2, 6, sigma_str));
+      ui.set_status_and_level(MString<30>(GET_TEXT_F(MSG_M48_DEVIATION), F(": "), w_float_t(sigma, 2, 6)));
     #endif
   }
 

diff --git a/Marlin/src/gcode/host/M114.cpp b/Marlin/src/gcode/host/M114.cpp
@@ -29,19 +29,17 @@
 #if ENABLED(M114_DETAIL)
 
   void report_all_axis_pos(const xyze_pos_t &pos, const uint8_t n=LOGICAL_AXES, const uint8_t precision=3) {
-    char str[12];
     for (uint8_t a = 0; a < n; ++a) {
       SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_LBL[a]));
       if (pos[a] >= 0) SERIAL_CHAR(' ');
-      SERIAL_ECHO(dtostrf(pos[a], 1, precision, str));
+      SERIAL_ECHO(p_float_t(pos[a], precision));
     }
     SERIAL_EOL();
   }
   inline void report_linear_axis_pos(const xyze_pos_t &pos) { report_all_axis_pos(pos, XYZ); }
 
   void report_linear_axis_pos(const xyz_pos_t &pos, const uint8_t precision=3) {
-    char str[12];
-    LOOP_NUM_AXES(a) SERIAL_ECHOPGM_P((PGM_P)pgm_read_ptr(&SP_AXIS_LBL[a]), dtostrf(pos[a], 1, precision, str));
+    LOOP_NUM_AXES(a) SERIAL_ECHO(FPSTR(pgm_read_ptr(&SP_AXIS_LBL[a])), p_float_t(pos[a], precision));
     SERIAL_EOL();
   }
 

diff --git a/Marlin/src/inc/Conditionals_post.h b/Marlin/src/inc/Conditionals_post.h
@@ -2498,6 +2498,9 @@
   #if ANY(PROUI_PID_TUNE, MPC_AUTOTUNE) && DISABLED(DISABLE_TUNING_GRAPH)
     #define PROUI_TUNING_GRAPH 1
   #endif
+  #if HAS_MESH && !defined(USE_GRID_MESHVIEWER)
+    #define USE_GRID_MESHVIEWER 1
+  #endif
 #endif
 
 // Thermal protection

diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
@@ -65,8 +65,9 @@
 
 BedLevelTools bedLevelTools;
 
-#if ENABLED(USE_GRID_MESHVIEWER)
+#if USE_GRID_MESHVIEWER
   bool BedLevelTools::viewer_asymmetric_range = false;
+  bool BedLevelTools::view_mesh = false;
   bool BedLevelTools::viewer_print_value = false;
 #endif
 bool BedLevelTools::goto_mesh_value = false;
@@ -212,7 +213,7 @@ bool BedLevelTools::meshValidate() {
   return true;
 }
 
-#if ENABLED(USE_GRID_MESHVIEWER)
+#if USE_GRID_MESHVIEWER
 
   constexpr uint8_t meshfont = TERN(TJC_DISPLAY, font8x16, font6x12);
 

diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h b/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
@@ -52,8 +52,9 @@
 
 class BedLevelTools {
 public:
-  #if ENABLED(USE_GRID_MESHVIEWER)
+  #if USE_GRID_MESHVIEWER
     static bool viewer_asymmetric_range;
+    static bool view_mesh;
     static bool viewer_print_value;
   #endif
   static bool goto_mesh_value;
@@ -75,7 +76,7 @@ class BedLevelTools {
   static float getMaxValue();
   static float getMinValue();
   static bool meshValidate();
-  #if ENABLED(USE_GRID_MESHVIEWER)
+  #if USE_GRID_MESHVIEWER
     static void drawBedMesh(int16_t selected=-1, uint8_t gridline_width=1, uint16_t padding_x=8, uint16_t padding_y_top=(40 + 53 - 7));
     static void setMeshViewerStatus();
   #endif

diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -1949,7 +1949,6 @@ void dwinRedrawScreen() {
   void onClickConfirmToPrint() {
     dwinResetStatusLine();
     if (hmiFlag.select_flag) {     // Confirm
-      gotoMainMenu();
       return card.openAndPrintFile(card.filename);
     }
     else
@@ -2189,6 +2188,12 @@ void setMoveZ() { hmiValue.axis = Z_AXIS; setPFloatOnClick(Z_MIN_POS, Z_MAX_POS,
   }
 #endif
 
+#if HAS_MESH && USE_GRID_MESHVIEWER
+  void setViewMesh() {
+    toggleCheckboxLine(bedLevelTools.view_mesh);
+  }
+#endif
+
 #if HAS_HOME_OFFSET
   void applyHomeOffset() { set_home_offset(hmiValue.axis, menuData.value / MINUNITMULT); }
   void setHomeOffsetX() { hmiValue.axis = X_AXIS; setPFloatOnClick(-50, 50, UNITFDIGITS, applyHomeOffset); }
@@ -3478,12 +3483,15 @@ void drawMotionMenu() {
 
   void drawManualMeshMenu() {
     checkkey = ID_Menu;
-    if (SET_MENU(manualMesh, MSG_UBL_MANUAL_MESH, 6)) {
+    if (SET_MENU(manualMesh, MSG_UBL_MANUAL_MESH, 7)) {
       BACK_ITEM(drawPrepareMenu);
       MENU_ITEM(ICON_ManualMesh, MSG_LEVEL_BED, onDrawMenuItem, manualMeshStart);
       mMeshMoveZItem = EDIT_ITEM(ICON_Zoffset, MSG_MOVE_Z, onDrawMMeshMoveZ, setMMeshMoveZ, &current_position.z);
       MENU_ITEM(ICON_Axis, MSG_UBL_CONTINUE_MESH, onDrawMenuItem, manualMeshContinue);
       MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer);
+      #if USE_GRID_MESHVIEWER
+        EDIT_ITEM(ICON_PrintSize, MSG_CHANGE_MESH_VIEWER, onDrawChkbMenu, setViewMesh, &bedLevelTools.view_mesh);
+      #endif
       MENU_ITEM(ICON_MeshSave, MSG_UBL_SAVE_MESH, onDrawMenuItem, manualMeshSave);
     }
     updateMenu(manualMesh);
@@ -3983,7 +3991,7 @@ void drawStepsMenu() {
 
   void drawMeshSetMenu() {
     checkkey = ID_Menu;
-    if (SET_MENU(meshMenu, MSG_MESH_LEVELING, 14)) {
+    if (SET_MENU(meshMenu, MSG_MESH_LEVELING, 15)) {
       BACK_ITEM(drawAdvancedSettingsMenu);
       #if ENABLED(PREHEAT_BEFORE_LEVELING)
         EDIT_ITEM(ICON_Temperature, MSG_UBL_SET_TEMP_BED, onDrawPIntMenu, setBedLevT, &hmiData.bedLevT);
@@ -4006,6 +4014,9 @@ void drawStepsMenu() {
         MENU_ITEM(ICON_MeshEdit, MSG_EDIT_MESH, onDrawSubMenu, drawEditMeshMenu);
       #endif
       MENU_ITEM(ICON_MeshViewer, MSG_MESH_VIEW, onDrawSubMenu, dwinMeshViewer);
+      #if USE_GRID_MESHVIEWER
+        EDIT_ITEM(ICON_PrintSize, MSG_CHANGE_MESH_VIEWER, onDrawChkbMenu, setViewMesh, &bedLevelTools.view_mesh);
+      #endif
     }
     updateMenu(meshMenu);
   }
@@ -4020,7 +4031,7 @@ void drawStepsMenu() {
         BACK_ITEM(drawMeshSetMenu);
         EDIT_ITEM(ICON_MeshEditX, MSG_MESH_X, onDrawPInt8Menu, setEditMeshX, &bedLevelTools.mesh_x);
         EDIT_ITEM(ICON_MeshEditY, MSG_MESH_Y, onDrawPInt8Menu, setEditMeshY, &bedLevelTools.mesh_y);
-        editZValueItem = EDIT_ITEM(ICON_MeshEditZ, MSG_MESH_EDIT_Z, onDrawPFloat2Menu, setEditZValue, &bedlevel.z_values[bedLevelTools.mesh_x][bedLevelTools.mesh_y]);
+        editZValueItem = EDIT_ITEM(ICON_MeshEditZ, MSG_MESH_EDIT_Z, onDrawPFloat3Menu, setEditZValue, &bedlevel.z_values[bedLevelTools.mesh_x][bedLevelTools.mesh_y]);
       }
       updateMenu(editMeshMenu);
     }

diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
@@ -43,22 +43,6 @@
 #define THUMBWIDTH 230
 #define THUMBHEIGHT 180
 
-typedef struct {
-  char name[13] = "";   //8.3 + null
-  uint32_t thumbstart = 0;
-  int thumbsize = 0;
-  int thumbheight = 0;
-  int thumbwidth = 0;
-  uint8_t *thumbdata = nullptr;
-  float time = 0;
-  float filament = 0;
-  float layer = 0;
-  float width = 0;
-  float height = 0;
-  float length = 0;
-  void setname(const char * const fn);
-  void clear();
-} fileprop_t;
 fileprop_t fileprop;
 
 void fileprop_t::setname(const char * const fn) {

diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.h b/Marlin/src/lcd/e3v2/proui/gcode_preview.h
@@ -28,6 +28,25 @@
  * Date: 2022/09/03
  */
 
+typedef struct {
+  char name[13] = "";   //8.3 + null
+  uint32_t thumbstart = 0;
+  int thumbsize = 0;
+  int thumbheight = 0;
+  int thumbwidth = 0;
+  uint8_t *thumbdata = nullptr;
+  float time = 0;
+  float filament = 0;
+  float layer = 0;
+  float width = 0;
+  float height = 0;
+  float length = 0;
+  void setname(const char * const fn);
+  void clear();
+} fileprop_t;
+
+extern fileprop_t fileprop;
+
 void Preview_DrawFromSD();
 void Preview_Invalidate();
 bool Preview_Valid();

diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -38,7 +38,7 @@
 #include "../../../feature/bedlevel/bedlevel.h"
 #include "meshviewer.h"
 
-#if ENABLED(USE_GRID_MESHVIEWER)
+#if USE_GRID_MESHVIEWER
   #include "bedlevel_tools.h"
 #endif
 
@@ -119,14 +119,23 @@ void MeshViewer::drawMesh(const bed_mesh_t zval, const uint8_t csizex, const uin
 
 void MeshViewer::draw(const bool withsave/*=false*/, const bool redraw/*=true*/) {
   title.showCaption(GET_TEXT_F(MSG_MESH_VIEWER));
-  #if ENABLED(USE_GRID_MESHVIEWER)
-    DWINUI::clearMainArea();
-    bedLevelTools.viewer_print_value = true;
-    bedLevelTools.drawBedMesh(-1, 1, 8, 10 + TITLE_HEIGHT);
+
+  #if USE_GRID_MESHVIEWER
+    const bool see_mesh = bedLevelTools.view_mesh;
+    if (see_mesh) {
+      DWINUI::clearMainArea();
+      bedLevelTools.viewer_print_value = true;
+      bedLevelTools.drawBedMesh(-1, 1, 8, 10 + TITLE_HEIGHT);
+    }
   #else
+    constexpr bool see_mesh = false;
+  #endif
+
+  if (!see_mesh) {
     if (redraw) drawMesh(bedlevel.z_values, GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y);
     else DWINUI::drawBox(1, hmiData.colorBackground, { 89, 305, 99, 38 });
-  #endif
+  }
+
   if (withsave) {
     DWINUI::drawButton(BTN_Save, 26, 305);
     DWINUI::drawButton(BTN_Continue, 146, 305);
@@ -135,12 +144,12 @@ void MeshViewer::draw(const bool withsave/*=false*/, const bool redraw/*=true*/)
   else
     DWINUI::drawButton(BTN_Continue, 86, 305);
 
-  #if ENABLED(USE_GRID_MESHVIEWER)
-    bedLevelTools.setMeshViewerStatus();
-  #else
-    char str_1[6], str_2[6] = "";
-    ui.status_printf(0, F("Mesh minZ: %s, maxZ: %s"), dtostrf(min, 1, 2, str_1), dtostrf(max, 1, 2, str_2));
+  #if USE_GRID_MESHVIEWER
+    if (see_mesh) bedLevelTools.setMeshViewerStatus();
   #endif
+
+  if (!see_mesh)
+    ui.set_status_and_level(MString<30>(F("Mesh Z min: "), p_float_t(min, 2), F(", max: "), p_float_t(max, 2)), 0);
 }
 
 void drawMeshViewer() { meshViewer.draw(true, meshredraw); }

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
@@ -171,6 +171,7 @@ namespace LanguageNarrow_en {
   LSTR MSG_MESH_VIEWER                    = _UxGT("Mesh Viewer");
   LSTR MSG_EDIT_MESH                      = _UxGT("Edit Mesh");
   LSTR MSG_MESH_VIEW                      = _UxGT("View Mesh");
+  LSTR MSG_CHANGE_MESH_VIEWER             = _UxGT("Change Mesh Viewer");
   LSTR MSG_EDITING_STOPPED                = _UxGT("Mesh Editing Stopped");
   LSTR MSG_NO_VALID_MESH                  = _UxGT("No valid mesh");
   LSTR MSG_ACTIVATE_MESH                  = _UxGT("Activate Leveling");

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
@@ -1634,6 +1634,8 @@ void MarlinUI::host_notify(const char * const cstr) {
     pgm ? host_notify_P(ustr) : host_notify(ustr);
   }
   void MarlinUI::status_printf_P(int8_t level, PGM_P const fmt, ...) {
+    if (set_alert_level(level)) return;
+
     MString<30> msg;
 
     va_list args;

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -457,23 +457,23 @@ class MarlinUI {
    * @param fstr  A constant F-string to set as the status.
    * @param level Alert level. Negative to ignore and reset the level. Non-zero never expires.
    */
-  static void set_status_and_level(const char * const cstr, const int8_t level) { _set_status_and_level(cstr, level, false); }
+  static void set_status_and_level(const char * const cstr, const int8_t level=0) { _set_status_and_level(cstr, level, false); }
 
   /**
    * @brief Set Status with a P-string and alert level.
    *
    * @param ustr  A C- or P-string, according to pgm.
    * @param level Alert level. Negative to ignore and reset the level. Non-zero never expires.
    */
-  static void set_status_and_level_P(PGM_P const pstr, const int8_t level) { _set_status_and_level(pstr, level, true); }
+  static void set_status_and_level_P(PGM_P const pstr, const int8_t level=0) { _set_status_and_level(pstr, level, true); }
 
   /**
    * @brief Set Status with a fixed string and alert level.
    *
    * @param fstr  A constant F-string to set as the status.
    * @param level Alert level. Negative to ignore and reset the level. Non-zero never expires.
    */
-  static void set_status_and_level(FSTR_P const fstr, const int8_t level) { set_status_and_level_P(FTOP(fstr), level); }
+  static void set_status_and_level(FSTR_P const fstr, const int8_t level=0) { set_status_and_level_P(FTOP(fstr), level); }
 
   static void set_max_status(FSTR_P const fstr) { set_status_and_level(fstr, 127); }
   static void set_min_status(FSTR_P const fstr) { set_status_and_level(fstr,  -1); }

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -580,6 +580,13 @@ typedef struct SettingsDataStruct {
     bool sound_on;
   #endif
 
+  //
+  // Toggle the meshviwer
+  //
+  #if USE_GRID_MESHVIEWER
+    bool view_mesh;
+  #endif
+
   //
   // Fan tachometer check
   //
@@ -1669,6 +1676,13 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(ui.sound_on);
     #endif
 
+    //
+    // Toggle the meshviewer
+    //
+    #if USE_GRID_MESHVIEWER
+      EEPROM_WRITE(bedLevelTools.view_mesh);
+    #endif
+
     //
     // Fan tachometer check
     //
@@ -2729,6 +2743,14 @@ void MarlinSettings::postprocess() {
         EEPROM_READ(ui.sound_on);
       #endif
 
+      //
+      // Toggle the meshviewer
+      //
+      #if USE_GRID_MESHVIEWER
+        _FIELD_TEST(view_mesh);
+        EEPROM_READ(bedLevelTools.view_mesh);
+      #endif
+
       //
       // Fan tachometer check
       //
@@ -3188,6 +3210,13 @@ void MarlinSettings::reset() {
     ui.sound_on = ENABLED(SOUND_ON_DEFAULT);
   #endif
 
+  //
+  // Toggle the meshviewer
+  //
+  #if USE_GRID_MESHVIEWER
+    bedLevelTools.view_mesh = false;
+  #endif
+
   //
   // Magnetic Parking Extruder
   //

diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
@@ -647,13 +647,13 @@
 #elif MB(CHITU3D_V9)
   #include "stm32f1/pins_CHITU3D_V9.h"              // STM32F1                              env:chitu_f103 env:chitu_f103_maple
 #elif MB(CREALITY_V4)
-  #include "stm32f1/pins_CREALITY_V4.h"             // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
+  #include "stm32f1/pins_CREALITY_V4.h"             // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple env:STM32F103RC_creality_maple
 #elif MB(CREALITY_V4210)
   #include "stm32f1/pins_CREALITY_V4210.h"          // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V425)
   #include "stm32f1/pins_CREALITY_V425.h"           // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
 #elif MB(CREALITY_V422)
-  #include "stm32f1/pins_CREALITY_V422.h"           // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple
+  #include "stm32f1/pins_CREALITY_V422.h"           // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer env:STM32F103RE_creality_maple env:STM32F103RC_creality_maple
 #elif MB(CREALITY_V423)
   #include "stm32f1/pins_CREALITY_V423.h"           // STM32F1                              env:STM32F103RE_creality env:STM32F103RE_creality_xfer env:STM32F103RC_creality env:STM32F103RC_creality_xfer
 #elif MB(CREALITY_V427)