Follow up to "🚸 Update ProUI Plot graph (#26539)"

Marlin/src/feature/pause.h

@@ -48,15 +48,15 @@ enum PauseMessage : char {
   PAUSE_MESSAGE_PARKING,
   PAUSE_MESSAGE_CHANGING,
   PAUSE_MESSAGE_WAITING,
-  PAUSE_MESSAGE_UNLOAD,
   PAUSE_MESSAGE_INSERT,
   PAUSE_MESSAGE_LOAD,
+  PAUSE_MESSAGE_UNLOAD,
   PAUSE_MESSAGE_PURGE,
   PAUSE_MESSAGE_OPTION,
   PAUSE_MESSAGE_RESUME,
-  PAUSE_MESSAGE_STATUS,
   PAUSE_MESSAGE_HEAT,
-  PAUSE_MESSAGE_HEATING
+  PAUSE_MESSAGE_HEATING,
+  PAUSE_MESSAGE_STATUS
 };
 
 #if M600_PURGE_MORE_RESUMABLE

Marlin/src/lcd/e3v2/common/dwin_api.cpp

@@ -153,21 +153,23 @@ void dwinFrameClear(const uint16_t color) {
   dwinSend(i);
 }
 
-// Draw a point
-//  color: point color
-//  width: point width   0x01-0x0F
-//  height: point height 0x01-0x0F
-//  x,y: upper left point
-void dwinDrawPoint(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
-  size_t i = 0;
-  dwinByte(i, 0x02);
-  dwinWord(i, color);
-  dwinByte(i, width);
-  dwinByte(i, height);
-  dwinWord(i, x);
-  dwinWord(i, y);
-  dwinSend(i);
-}
+#if DISABLED(TJC_DISPLAY)
+  // Draw a point
+  //  color: point color
+  //  width: point width   0x01-0x0F
+  //  height: point height 0x01-0x0F
+  //  x,y: upper left point
+  void dwinDrawPoint(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) {
+    size_t i = 0;
+    dwinByte(i, 0x02);
+    dwinWord(i, color);
+    dwinByte(i, width);
+    dwinByte(i, height);
+    dwinWord(i, x);
+    dwinWord(i, y);
+    dwinSend(i);
+  }
+#endif
 
 // Draw a line
 //  color: Line segment color

Marlin/src/lcd/e3v2/common/dwin_api.h

@@ -112,7 +112,11 @@ void dwinFrameClear(const uint16_t color);
 //  width: point width   0x01-0x0F
 //  height: point height 0x01-0x0F
 //  x,y: upper left point
-void dwinDrawPoint(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+#if ENABLED(TJC_DISPLAY)
+  inline void dwinDrawPoint(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y) { dwinDrawBox(1, color, x, y, 1, 1); }
+#else
+  void dwinDrawPoint(uint16_t color, uint8_t width, uint8_t height, uint16_t x, uint16_t y);
+#endif
 
 // Draw a line
 //  color: Line segment color

Marlin/src/lcd/e3v2/common/dwin_set.h

@@ -82,7 +82,7 @@
 #define ICON_Motion             41
 #define ICON_WriteEEPROM        42
 #define ICON_ReadEEPROM         43
-#define ICON_ResumeEEPROM       44
+#define ICON_ResetEEPROM        44
 #define ICON_Info               45
 
 #define ICON_SetEndTemp         46
@@ -135,16 +135,16 @@
 
 #define ICON_Folder       ICON_More
 #define ICON_AdvSet       ICON_Language
-#define ICON_HomeOffset   ICON_AdvSet
+#define ICON_HomeOffset   ICON_PrintSize
 #define ICON_HomeOffsetX  ICON_StepX
 #define ICON_HomeOffsetY  ICON_StepY
 #define ICON_HomeOffsetZ  ICON_StepZ
 #define ICON_ProbeOffset  ICON_AdvSet
 #define ICON_ProbeOffsetX ICON_StepX
 #define ICON_ProbeOffsetY ICON_StepY
 #define ICON_ProbeOffsetZ ICON_StepZ
-#define ICON_PIDNozzle    ICON_SetEndTemp
-#define ICON_PIDbed       ICON_SetBedTemp
+#define ICON_PIDNozzle    ICON_HotendTemp
+#define ICON_PIDBed       ICON_BedTemp
 #define ICON_FWRetract    ICON_StepE
 #define ICON_FWRetLength  ICON_StepE
 #define ICON_FWRetSpeed   ICON_Setspeed

Marlin/src/lcd/e3v2/creality/dwin.cpp

@@ -905,7 +905,7 @@ void drawControlMenu() {
   #if ENABLED(EEPROM_SETTINGS)
     _TEMP_ICON(CONTROL_CASE_SAVE, ICON_WriteEEPROM, false);
     _TEMP_ICON(CONTROL_CASE_LOAD, ICON_ReadEEPROM, false);
-    _TEMP_ICON(CONTROL_CASE_RESET, ICON_ResumeEEPROM, false);
+    _TEMP_ICON(CONTROL_CASE_RESET, ICON_ResetEEPROM, false);
   #endif
 }
 
@@ -2468,7 +2468,7 @@ void itemAdvBedPID(const uint8_t row) {
       itemAreaCopy(145, 104, 167, 114, row, 27); // "PID"
     #endif
   }
-  drawMenuLine(row, ICON_PIDbed);
+  drawMenuLine(row, ICON_PIDBed);
 }
 
 #if ENABLED(POWER_LOSS_RECOVERY)

Marlin/src/lcd/e3v2/jyersui/dwin.cpp

@@ -1158,7 +1158,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
         #if ENABLED(ADVANCED_PAUSE_FEATURE)
           case PREPARE_CHANGEFIL:
             if (draw) {
-              drawMenuItem(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE)
+              drawMenuItem(row, ICON_ResetEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE)
                 #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
                   , nullptr, true
                 #endif
@@ -1766,7 +1766,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
             break;
           case CHANGEFIL_CHANGE:
             if (draw)
-              drawMenuItem(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
+              drawMenuItem(row, ICON_ResetEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
             else {
               if (thermalManager.targetTooColdToExtrude(0))
                 popupHandler(Popup_ETemp);
@@ -3449,7 +3449,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
               break;
             case LEVELING_SETTINGS_PLANE:
               if (draw)
-                drawMenuItem(row, ICON_ResumeEEPROM, F("Convert Mesh to Plane"));
+                drawMenuItem(row, ICON_ResetEEPROM, F("Convert Mesh to Plane"));
               else {
                 if (mesh_conf.createPlaneFromMesh()) break;
                 gcode.process_subcommands_now(F("M420 S1"));
@@ -3594,7 +3594,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
           #if ENABLED(AUTO_BED_LEVELING_UBL)
             case LEVELING_M_UNDEF:
               if (draw)
-                drawMenuItem(row, ICON_ResumeEEPROM, F("Clear Point Value"));
+                drawMenuItem(row, ICON_ResetEEPROM, F("Clear Point Value"));
               else {
                 mesh_conf.manualValueUpdate(true);
                 redrawMenu(false);
@@ -3924,7 +3924,7 @@ void JyersDWIN::menuItemHandler(const uint8_t menu, const uint8_t item, bool dra
         #if ENABLED(FILAMENT_LOAD_UNLOAD_GCODES)
           case TUNE_CHANGEFIL:
             if (draw)
-              drawMenuItem(row, ICON_ResumeEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
+              drawMenuItem(row, ICON_ResetEEPROM, GET_TEXT_F(MSG_FILAMENTCHANGE));
             else
               popupHandler(Popup_ConfFilChange);
             break;

Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp

@@ -89,9 +89,10 @@ bool drawing_mesh = false;
     struct linear_fit_data lsf_results;
     incremental_LSF_reset(&lsf_results);
     GRID_LOOP(x, y) {
-      if (!isnan(bedlevel.z_values[x][y])) {
+      const float z = bedlevel.z_values[x][y];
+      if (!isnan(z)) {
         xy_pos_t rpos = { bedlevel.get_mesh_x(x), bedlevel.get_mesh_y(y) };
-        incremental_LSF(&lsf_results, rpos, bedlevel.z_values[x][y]);
+        incremental_LSF(&lsf_results, rpos, z);
       }
     }
 
@@ -232,46 +233,50 @@ bool BedLevelTools::meshValidate() {
       const auto end_x_px   = start_x_px + cell_width_px - 1 - gridline_width;
       const auto start_y_px = padding_y_top + ((GRID_MAX_POINTS_Y) - y - 1) * cell_height_px;
       const auto end_y_px   = start_y_px + cell_height_px - 1 - gridline_width;
-      dwinDrawRectangle(1,                                                                                 // RGB565 colors: http://www.barth-dev.de/online/rgb565-color-picker/
-        isnan(bedlevel.z_values[x][y]) ? COLOR_GREY : (                                                           // gray if undefined
-          (bedlevel.z_values[x][y] < 0 ?
-            (uint16_t)round(0x1F * -bedlevel.z_values[x][y] / rmax) << 11 : // red if mesh point value is negative
-            (uint16_t)round(0x3F *  bedlevel.z_values[x][y] / rmax) << 5) | // green if mesh point value is positive
-              _MIN(0x1F, (((uint8_t)abs(bedlevel.z_values[x][y]) / 10) * 4))),                                    // + blue stepping for every mm
-        start_x_px, start_y_px, end_x_px, end_y_px
+      const float z = bedlevel.z_values[x][y];
+      const uint16_t color = isnan(z) ? COLOR_GREY : (    // Gray if undefined
+        (z < 0 ? uint16_t(round(0x1F * -z / rmax)) << 11  // Red for negative mesh point
+               : uint16_t(round(0x3F *  z / rmax)) << 5)  // Green for positive mesh point
+        | _MIN(0x1F, (((uint8_t)abs(z) / 10) * 4))        // + Blue stepping for every mm
       );
 
+      dwinDrawRectangle(1, color, start_x_px, start_y_px, end_x_px, end_y_px);
+
       safe_delay(10);
       LCD_SERIAL.flushTX();
 
       // Draw value text on
+      if (!viewer_print_value) continue;
+
       const uint8_t fs = DWINUI::fontWidth(meshfont);
-      if (viewer_print_value) {
-        const int8_t offset_y = cell_height_px / 2 - fs;
-        if (isnan(bedlevel.z_values[x][y])) {  // undefined
-          dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
-        }
-        else {                          // has value
-          MString<12> msg;
-          if ((GRID_MAX_POINTS_X) < TERN(TJC_DISPLAY, 8, 10))
-            msg.set(p_float_t(abs(bedlevel.z_values[x][y]), 2));
-          else
-            msg.setf(F("%02i"), uint16_t(abs(bedlevel.z_values[x][y] - int16_t(bedlevel.z_values[x][y])) * 100));
-          const int8_t offset_x = cell_width_px / 2 - (fs / 2) * msg.length() - 2;
-          if ((GRID_MAX_POINTS_X) >= TERN(TJC_DISPLAY, 8, 10))
-            dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px - 2 + offset_x, start_y_px + offset_y, F("."));
-          dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + 1 + offset_x, start_y_px + offset_y, msg);
-        }
-        safe_delay(10);
-        LCD_SERIAL.flushTX();
+      const int8_t offset_y = cell_height_px / 2 - fs;
+      const float z = bedlevel.z_values[x][y];
+      if (isnan(z)) { // undefined
+        dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + cell_width_px / 2 - 5, start_y_px + offset_y, F("X"));
       }
-    }
+      else {          // has value
+        MString<12> msg;
+        constexpr bool is_wide = (GRID_MAX_POINTS_X) < TERN(TJC_DISPLAY, 8, 10);
+        if (is_wide)
+          msg.setf(F("%02i"), uint16_t(z * 100) % 100);
+        else
+          msg.set(p_float_t(abs(z), 2));
+        const int8_t offset_x = cell_width_px / 2 - (fs / 2) * msg.length() - 2;
+        if (is_wide)
+          dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px - 2 + offset_x, start_y_px + offset_y, F("."));
+        dwinDrawString(false, meshfont, COLOR_WHITE, COLOR_BG_BLUE, start_x_px + 1 + offset_x, start_y_px + offset_y, msg);
+      }
+
+      safe_delay(10);
+      LCD_SERIAL.flushTX();
+
+    } // GRID_LOOP
   }
 
   void BedLevelTools::setMeshViewerStatus() { // TODO: draw gradient with values as a legend instead
     float v_max = abs(getMaxValue()), v_min = abs(getMinValue()), rmax = _MAX(v_min, v_max), rmin = _MIN(v_min, v_max);
-    if (rmax > 3e+10f) rmax = 0.0000001;
-    if (rmin > 3e+10f) rmin = 0.0000001;
+    if (rmax > 3e+10f) rmax = 0.0000001f;
+    if (rmin > 3e+10f) rmin = 0.0000001f;
     ui.set_status(&MString<47>(F("Red "),  p_float_t(-rmax, 3), F("..0.."), p_float_t(rmin, 3), F(" Green")));
     drawing_mesh = false;
   }