Updates Tramming Wizard

Updates Mesh Viewer
mriscoc · Feb 20, 2022 · 8dd7d75 · 8dd7d75
1 parent 4dfb24a
commit 8dd7d75
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 20 deletions.
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/e3v2/proui/dwin.cpp
@@ -2517,11 +2517,11 @@ void TramC () { Tram(4); }
 
 #if HAS_ONESTEP_LEVELING
   void Trammingwizard() {
+    bed_mesh_t zval = {0};
     if (HMI_data.FullManualTramming) {
       ui.set_status(F("Disable manual tramming"));
       return;
     }
-    bed_mesh_t zval = {0};
     zval[0][0] = Tram(0);
     checkkey = NothingToDo;
     MeshViewer.DrawMesh(zval, 2, 2);
@@ -2537,13 +2537,30 @@ void TramC () { Tram(4); }
       dtostrf(MeshViewer.max, 1, 2, str_2)
     );
     if (ABS(MeshViewer.max - MeshViewer.min) < 0.05) {
-      DWINUI::Draw_CenteredString(130,F("Corners leveled"));
-      DWINUI::Draw_CenteredString(150,F("Tolerance achieved!"));
+      DWINUI::Draw_CenteredString(140,F("Corners leveled"));
+      DWINUI::Draw_CenteredString(160,F("Tolerance achieved!"));
     } else {
-      DWINUI::Draw_CenteredString(130,F("Corners not leveled"));
-      DWINUI::Draw_CenteredString(150,F("Knob adjustment required"));
+      uint8_t p = 0;
+      float d, max = 0;
+      FSTR_P plabel;
+      LOOP_L_N(x,2) LOOP_L_N(y,2) {
+        d = ABS(zval[x][y] - MeshViewer.avg);
+        if (max < d) {
+          max = d;
+          p = x + 2 * y;
+        }
+      }
+      switch (p) {
+        case 0b00 : plabel = GET_TEXT_F(MSG_LEVBED_FL); break;
+        case 0b01 : plabel = GET_TEXT_F(MSG_LEVBED_FR); break;
+        case 0b10 : plabel = GET_TEXT_F(MSG_LEVBED_BL); break;
+        case 0b11 : plabel = GET_TEXT_F(MSG_LEVBED_BR); break;
+        default   : plabel = F(""); break;
+      }
+      DWINUI::Draw_CenteredString(130, F("Corners not leveled"));
+      DWINUI::Draw_CenteredString(150, F("Knob adjustment required"));
+      DWINUI::Draw_CenteredString(Color_Green, 170, plabel);
     }
-//    LOOP_L_N(x,1) LOOP_L_N(y,1) 
     DWINUI::Draw_IconWB(ICON_Continue_E, 86, 305);
     checkkey = Menu;
     HMI_SaveProcessID(WaitResponse);

diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
@@ -188,13 +188,13 @@ void DWIN_SRAMToPic(uint8_t picID) {
 //--------------------------Test area -------------------------
 
 //void DWIN_ReadSRAM(uint16_t addr, uint8_t length, const char * const data) {
-//   size_t i = 0;
-//   DWIN_Byte(i, 0x32);
-//   DWIN_Byte(i, 0x5A);  // 0x5A Read from SRAM - 0xA5 Read from Flash
-//   DWIN_Word(i, addr);  // 0x0000 to 0x7FFF
-//   const size_t len = _MIN(0xF0, length);
-//   DWIN_Byte(i, len);
-//   DWIN_Send(i);
+//  size_t i = 0;
+//  DWIN_Byte(i, 0x32);
+//  DWIN_Byte(i, 0x5A);  // 0x5A Read from SRAM - 0xA5 Read from Flash
+//  DWIN_Word(i, addr);  // 0x0000 to 0x7FFF
+//  const size_t len = _MIN(0xF0, length);
+//  DWIN_Byte(i, len);
+//  DWIN_Send(i);
 //}
 
 #endif // DWIN_LCD_PROUI
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/e3v2/proui/dwinui.h
@@ -425,7 +425,7 @@ namespace DWINUI {
   inline void Draw_String(uint16_t color, FSTR_P string, uint16_t rlimit = 0xFFFF) {
     Draw_String(color, FTOP(string), rlimit);
   }
-  
+
   // Draw a string
   //  size: Font size
   //  color: Character color

diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/e3v2/proui/meshviewer.cpp
@@ -57,7 +57,7 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
   }
   max = (float)maxz / 100;
   min = (float)minz / 100;
-  avg = avg / (sizex * sizey);
+  avg = avg / (100 * sizex * sizey);
   DWINUI::ClearMenuArea();
   DWIN_Draw_Rectangle(0, HMI_data.SplitLine_Color, px(0), py(0), px(sizex - 1), py(sizey - 1));
   LOOP_S_L_N(x, 1, sizex - 1) DrawMeshVLine(x);
@@ -74,19 +74,19 @@ void MeshViewerClass::DrawMesh(bed_mesh_t zval, const uint8_t sizex, const uint8
         char str_1[9];
         str_1[0] = 0;
         switch (zmesh[x][y]) {
-          case -999 ... -100: 
+          case -999 ... -100:
             DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 18, py(y) - 6, zval[x][y]);
             break;
-          case -99 ... -1: 
+          case -99 ... -1:
             sprintf_P(str_1, PSTR("-.%02i"), -zmesh[x][y]);
             break;
           case 0:
             DWIN_Draw_String(false, font6x12, DWINUI::textcolor, DWINUI::backcolor, px(x) - 4, py(y) - 6, "0");;
             break;
-          case 1 ... 99: 
+          case 1 ... 99:
             sprintf_P(str_1, PSTR(".%02i"), zmesh[x][y]);
             break;
-          case 100 ... 999: 
+          case 100 ... 999:
             DWINUI::Draw_Signed_Float(font6x12, 1, 1, px(x) - 18, py(y) - 6, zval[x][y]);
             break;
         }

diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
@@ -46,7 +46,7 @@
 #define MEDIA_TYPE_EN "Media"
 
 namespace Language_en {
-  constexpr uint8_t    CHARSIZE                            = 2;
+  constexpr uint8_t CHARSIZE              = 2;
   LSTR LANGUAGE                           = _UxGT("English");
 
   // These strings should be translated