From ba27dce42d250a4e840c4f5ef3c5bf29d2dfd3ac Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Mon, 17 Nov 2025 15:09:50 -0600
Subject: [PATCH] apply to DGUS Reloaded

---
 .../lcd/extui/dgus_reloaded/DGUSRxHandler.cpp | 50 +++----------------
 Marlin/src/lcd/tramming.h                     | 38 +++++++++++---
 2 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
index 36a90c0ac6..52fefa8107 100644
--- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
+++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -459,47 +459,13 @@ void DGUSRxHandler::moveToPoint(DGUS_VP &vp, void *data_ptr) {
     return;
   }
 
-  const uint8_t point = ((uint8_t*)data_ptr)[1];
-
-  #if ENABLED(BED_TRAMMING_USE_PROBE)
-    const float lfrb[4] = {
-      (X_MIN_BED) + probe.min_x(),
-      (Y_MIN_BED) + probe.min_y(),
-      (X_MAX_BED) - probe.max_x(),
-      (Y_MAX_BED) - probe.max_y()
-    };
-  #endif
-
-  float x, y;
-
-  switch (point) {
-    default: return;
-    case 1:
-      x = DGUS_LEVEL_CENTER_X;
-      y = DGUS_LEVEL_CENTER_Y;
-      break;
-    case 2:
-      x = X_MIN_BED + lfrb[0];
-      y = Y_MIN_BED + lfrb[1];
-      break;
-    case 3:
-      x = X_MAX_BED - lfrb[2];
-      y = Y_MIN_BED + lfrb[1];
-      break;
-    case 4:
-      x = X_MAX_BED - lfrb[2];
-      y = Y_MAX_BED - lfrb[3];
-      break;
-    case 5:
-      x = X_MIN_BED + lfrb[0];
-      y = Y_MAX_BED - lfrb[3];
-      break;
-  }
+  const uint8_t point = ((uint8_t*)data_ptr)[1] - 1;
+  const xy_pos_t xy = tram_point_by_index(point);
 
   if (BED_TRAMMING_Z_HOP)
     ExtUI::setAxisPosition_mm(ExtUI::getAxisPosition_mm(ExtUI::Z) + (BED_TRAMMING_Z_HOP), ExtUI::Z);
-  ExtUI::setAxisPosition_mm(x, ExtUI::X);
-  ExtUI::setAxisPosition_mm(y, ExtUI::Y);
+  ExtUI::setAxisPosition_mm(xy.x, ExtUI::X);
+  ExtUI::setAxisPosition_mm(xy.y, ExtUI::Y);
   ExtUI::setAxisPosition_mm((Z_MIN_POS) + (BED_TRAMMING_HEIGHT), ExtUI::Z);
 }
 
@@ -524,12 +490,8 @@ void DGUSRxHandler::probe(DGUS_VP &vp, void *data_ptr) {
 
   screen.triggerScreenChange(DGUS_ScreenID::LEVELING_PROBING);
 
-  #if ENABLED(AUTO_BED_LEVELING_UBL)
-    queue.enqueue_now(F("G29P1\nG29P3\nG29P5C"));
-  #else
-    queue.enqueue_now(F("G29"));
-  #endif
-  queue.enqueue_now(F("M500"));
+  queue.enqueue_now(F(TERN(AUTO_BED_LEVELING_UBL, "G29P1\nG29P3\nG29P5C", "G29")));
+  queue.enqueue_now(F("M500"));   // Save results even if G29 fails
 }
 
 void DGUSRxHandler::disableABL(DGUS_VP &vp, void *data_ptr) {
diff --git a/Marlin/src/lcd/tramming.h b/Marlin/src/lcd/tramming.h
index d64143b68c..2f17def047 100644
--- a/Marlin/src/lcd/tramming.h
+++ b/Marlin/src/lcd/tramming.h
@@ -69,20 +69,41 @@ constexpr int8_t available_points = nr_edge_points + ENABLED(BED_TRAMMING_INCLUD
 constexpr int8_t center_index = TERN(BED_TRAMMING_INCLUDE_CENTER, available_points - 1, -1);
 
 // Center of the opposite edge for the 3rd point
+constexpr NamedPlace third_place() {
+  if (corners_are(LB, RB)) return FC; // Front Center
+  if (corners_are(LF, LB)) return RC; // Right Center
+  if (corners_are(RF, RB)) return LC; // Left Center
+  return BC; // Back Center
+}
+
 static inline xy_pos_t third_point() {
   #if ENABLED(BED_TRAMMING_USE_PROBE)
     constexpr float slop = 0.01f;
     const xy_pos_t lf = { (X_MIN_BED) + probe.min_x() + slop, (Y_MIN_BED) + probe.min_y() + slop },
                    rb = { (X_MAX_BED) - probe.max_x() - slop, (Y_MAX_BED) - probe.max_y() - slop };
   #endif
-  if (corners_are(LB, RB))
-    return xy_pos_t({ (lf.x + rb.x) / 2, lf.y }); // Front Center
-  if (corners_are(LF, LB))
-    return xy_pos_t({ rb.x, (lf.y + rb.y) / 2 }); // Right Center
-  if (corners_are(RF, RB))
-    return xy_pos_t({ lf.x, (lf.y + rb.y) / 2 }); // Left Center
-  //if (corners_are(LF, RF))
-    return xy_pos_t({ (lf.x + rb.x) / 2, rb.y }); // Back Center
+  switch (third_place()) {
+    case FC: return xy_pos_t({ (lf.x + rb.x) / 2, lf.y }); // Front Center
+    case RC: return xy_pos_t({ rb.x, (lf.y + rb.y) / 2 }); // Right Center
+    case LC: return xy_pos_t({ lf.x, (lf.y + rb.y) / 2 }); // Left Center
+    case BC: return xy_pos_t({ (lf.x + rb.x) / 2, rb.y }); // Back Center
+  }
+}
+
+static inline NamedPlace tram_place_by_index(const uint8_t i) {
+  if (tramming_3_points) {
+    switch (i) {
+      case 0 ... 1: return lco[i];                // 1st and 2nd point set explicitly by config
+      case 2: return third_point();               // 3rd point is based on the other two
+      #if ENABLED(BED_TRAMMING_INCLUDE_CENTER)
+        case 3: return CC;                        // 4th point is optional center
+      #endif
+    }
+  }
+  else {
+    // Four-Corner Bed Tramming with optional center
+    return TERN0(BED_TRAMMING_INCLUDE_CENTER, i == center_index) ? CC : return lco[i];
+  }
 }
 
 inline static xy_pos_t tram_point_by_index(const uint8_t i) {
@@ -96,6 +117,7 @@ inline static xy_pos_t tram_point_by_index(const uint8_t i) {
       case 0 ... 1:
         // First two corners set explicitly by the configuration
         switch (lco[i]) {
+          default:
           case LF: return lf;                       // Left Front
           case RF: return xy_pos_t({ rb.x, lf.y }); // Right Front
           case RB: return rb;                       // Right Back