Corner Leveling Marlin Fix

bigtreetech · Oct 8, 2023 · 62c3cf4 · 62c3cf4
1 parent 7d638de
commit 62c3cf4
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 232 deletions.
diff --git a/README.md b/README.md
@@ -120,7 +120,7 @@ the following options must be enabled in Marlin firmware.
 `AUTO_REPORT_TEMPERATURES` (in Configuration_adv.h)<br>
 `AUTO_REPORT_POSITION` (in Configuration_adv.h)<br>
 `EXTENDED_CAPABILITIES_REPORT` (in Configuration_adv.h)<br>
-`M115_GEOMETRY_REPORT` (in Configuration_adv.h)<br>
+`MIN/MAX_SOFTWARE_ENDSTOPS` (in Configuration.h)<br>
 `M114_DETAIL` (in Configuration_adv.h)<br>
 `REPORT_FAN_CHANGE` (in Configuration_adv.h)<br>
 

diff --git a/TFT/src/User/API/FanControl.c b/TFT/src/User/API/FanControl.c
@@ -27,7 +27,7 @@ bool fanIsValid(const uint8_t index)
     return false;
   else if (!infoSettings.ctrl_fan_en && index >= MAX_COOLING_FAN_COUNT)  // controller cooling fan is disabled
     return false;
-  else if (index >= (MAX_COOLING_FAN_COUNT + MAX_CRTL_FAN_COUNT))  // invalid controller cooling fan index (not active/idle)
+  else if (index >= (MAX_COOLING_FAN_COUNT + MAX_CTRL_FAN_COUNT))  // invalid controller cooling fan index (not active/idle)
     return false;
   else
     return true;

diff --git a/TFT/src/User/API/LevelingControl.c b/TFT/src/User/API/LevelingControl.c
@@ -12,8 +12,8 @@ float probedZ = 0.0f;                         // last Z offset measured by probe
 
 int16_t setCoordValue(AXIS axis, ALIGN_POSITION align)
 {
-  return ((align == LEFT || align == BOTTOM) ? infoSettings.machine_size_min[axis] + infoSettings.level_edge
-                                             : infoSettings.machine_size_max[axis] - infoSettings.level_edge) - infoParameters.HomeOffset[axis];
+  return ((align == LEFT || align == BOTTOM) ? infoSettings.level_edge
+                                             : infoSettings.bed_size[axis] - infoSettings.level_edge);
 }
 
 void levelingGetPointCoords(LEVELING_POINT_COORDS coords)

diff --git a/TFT/src/User/API/Settings.c b/TFT/src/User/API/Settings.c
@@ -157,8 +157,13 @@ void initSettings(void)
 
   for (int i = 0; i < AXIS_NUM; i++)  // x, y, z
   {
-    infoSettings.machine_size_min[i]  = default_size_min[i];
-    infoSettings.machine_size_max[i]  = default_size_max[i];
+    infoSettings.endstop_min[i]  = default_size_min[i];
+    infoSettings.endstop_max[i]  = default_size_max[i];
+  }
+
+  for (int i = 0; i < AXIS_NUM - 1; i++)  // x, y
+  {
+    infoSettings.bed_size[i] = default_size_max[i];
   }
 
   for (int i = 0; i < SPEED_COUNT; i++)

diff --git a/TFT/src/User/API/Settings.h b/TFT/src/User/API/Settings.h
@@ -14,10 +14,10 @@ extern "C" {
 // Config version support (format YYYYMMDD)
 // change if new elements/keywords are added/removed/changed in the Configuration.h
 // this number should match CONFIG_VERSION in Configuration.h
-#define CONFIG_SUPPPORT 20230821
+#define CONFIG_SUPPPORT 20231001
 
 #define FONT_FLASH_SIGN       20230821  // (YYYYMMDD) change if fonts require updating
-#define CONFIG_FLASH_SIGN     20230821  // (YYYYMMDD) change if any keyword(s) in config.ini is added or removed
+#define CONFIG_FLASH_SIGN     20231001  // (YYYYMMDD) change if any keyword(s) in config.ini is added or removed
 #define LANGUAGE_FLASH_SIGN   20230821  // (YYYYMMDD) change if any keyword(s) in language pack is added or removed
 #define ICON_FLASH_SIGN       20230821  // (YYYYMMDD) change if any icon(s) is added or removed
 
@@ -34,8 +34,8 @@ extern "C" {
 #define MAX_HEATER_COUNT      (MAX_HOTEND_COUNT + 2)  // hotends + bed + chamber
 #define MAX_HEATER_PID_COUNT  (MAX_HOTEND_COUNT + 1)  // hotends + bed
 #define MAX_COOLING_FAN_COUNT 6
-#define MAX_CRTL_FAN_COUNT    2
-#define MAX_FAN_COUNT         (MAX_COOLING_FAN_COUNT + MAX_CRTL_FAN_COUNT)
+#define MAX_CTRL_FAN_COUNT    2
+#define MAX_FAN_COUNT         (MAX_COOLING_FAN_COUNT + MAX_CTRL_FAN_COUNT)
 
 #define AXIS_NUM              (TOTAL_AXIS - 1)
 #define SPEED_COUNT            3
@@ -222,8 +222,9 @@ typedef struct
   uint16_t max_temp[MAX_HEATER_COUNT];  // hotends + bed + chamber
   uint16_t min_ext_temp;
   uint8_t  fan_max[MAX_FAN_COUNT];
-  int16_t  machine_size_min[AXIS_NUM];  // X, Y, Z
-  int16_t  machine_size_max[AXIS_NUM];  // X, Y, Z
+  int16_t  endstop_min[AXIS_NUM];  // X, Y, Z
+  int16_t  endstop_max[AXIS_NUM];  // X, Y, Z
+  uint16_t bed_size[AXIS_NUM - 1];  // X, Y
   uint16_t xy_speed[SPEED_COUNT];
   uint16_t z_speed[SPEED_COUNT];
   uint16_t ext_speed[SPEED_COUNT];

diff --git a/TFT/src/User/API/config.c b/TFT/src/User/API/config.c
@@ -774,18 +774,22 @@ void parseConfigKey(uint16_t index)
       if (key_seen("CtI:")) SET_VALID_INT_VALUE(infoSettings.fan_max[7], MIN_FAN_SPEED, MAX_FAN_SPEED);
       break;
 
-    case C_INDEX_SIZE_MIN:
-      if (key_seen("X")) SET_VALID_INT_VALUE(infoSettings.machine_size_min[X_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
-      if (key_seen("Y")) SET_VALID_INT_VALUE(infoSettings.machine_size_min[Y_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
-      if (key_seen("Z")) SET_VALID_INT_VALUE(infoSettings.machine_size_min[Z_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
+    case C_INDEX_ENDSTOP_MIN:
+      if (key_seen("X")) SET_VALID_INT_VALUE(infoSettings.endstop_min[X_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
+      if (key_seen("Y")) SET_VALID_INT_VALUE(infoSettings.endstop_min[Y_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
+      if (key_seen("Z")) SET_VALID_INT_VALUE(infoSettings.endstop_min[Z_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
       break;
 
-    case C_INDEX_SIZE_MAX:
-      if (key_seen("X")) SET_VALID_INT_VALUE(infoSettings.machine_size_max[X_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
-      if (key_seen("Y")) SET_VALID_INT_VALUE(infoSettings.machine_size_max[Y_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
-      if (key_seen("Z")) SET_VALID_INT_VALUE(infoSettings.machine_size_max[Z_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
+    case C_INDEX_ENDSTOP_MAX:
+      if (key_seen("X")) SET_VALID_INT_VALUE(infoSettings.endstop_max[X_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
+      if (key_seen("Y")) SET_VALID_INT_VALUE(infoSettings.endstop_max[Y_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
+      if (key_seen("Z")) SET_VALID_INT_VALUE(infoSettings.endstop_max[Z_AXIS], MIN_SIZE_LIMIT, MAX_SIZE_LIMIT);
       break;
 
+    case C_INDEX_BED_SIZE:
+      if (key_seen("X")) SET_VALID_INT_VALUE(infoSettings.bed_size[X_AXIS], 0, MAX_SIZE_LIMIT);
+      if (key_seen("Y")) SET_VALID_INT_VALUE(infoSettings.bed_size[Y_AXIS], 0, MAX_SIZE_LIMIT);
+
     case C_INDEX_XY_SPEED:
       if (key_seen("S")) SET_VALID_INT_VALUE(infoSettings.xy_speed[0], MIN_SPEED_LIMIT, MAX_SPEED_LIMIT);
       if (key_seen("N")) SET_VALID_INT_VALUE(infoSettings.xy_speed[1], MIN_SPEED_LIMIT, MAX_SPEED_LIMIT);

diff --git a/TFT/src/User/API/config.h b/TFT/src/User/API/config.h
@@ -69,8 +69,9 @@ extern "C" {
 #define CONFIG_MAX_TEMP               "max_temp:"
 #define CONFIG_MIN_TEMP               "min_temp:"
 #define CONFIG_FAN_MAX                "fan_max:"
-#define CONFIG_SIZE_MIN               "size_min:"
-#define CONFIG_SIZE_MAX               "size_max:"
+#define CONFIG_ENDSTOP_MIN            "pos_min:"
+#define CONFIG_ENDSTOP_MAX            "pos_max:"
+#define CONFIG_BED_SIZE               "bed_size:"
 #define CONFIG_XY_SPEED               "xy_speed:"
 #define CONFIG_Z_SPEED                "z_speed:"
 #define CONFIG_EXT_SPEED              "ext_speed:"

diff --git a/TFT/src/User/API/config.inc b/TFT/src/User/API/config.inc
@@ -62,8 +62,9 @@ X_CONFIG (CONTROLLER_FAN)
 X_CONFIG (MAX_TEMP)
 X_CONFIG (MIN_TEMP)
 X_CONFIG (FAN_MAX)
-X_CONFIG (SIZE_MIN)
-X_CONFIG (SIZE_MAX)
+X_CONFIG (ENDSTOP_MIN)
+X_CONFIG (ENDSTOP_MAX)
+X_CONFIG (BED_SIZE)
 X_CONFIG (XY_SPEED)
 X_CONFIG (Z_SPEED)
 X_CONFIG (EXT_SPEED)

diff --git a/TFT/src/User/API/interfaceCmd.c b/TFT/src/User/API/interfaceCmd.c
@@ -830,7 +830,7 @@ void sendQueueCmd(void)
               Serial_Forward(cmd_port_index, buf);
               sprintf(buf, "Cap:FAN_NUM:%d\n", infoSettings.fan_count);
               Serial_Forward(cmd_port_index, buf);
-              sprintf(buf, "Cap:FAN_CTRL_NUM:%d\n", infoSettings.ctrl_fan_en ? MAX_CRTL_FAN_COUNT : 0);
+              sprintf(buf, "Cap:FAN_CTRL_NUM:%d\n", infoSettings.ctrl_fan_en ? MAX_CTRL_FAN_COUNT : 0);
               Serial_Forward(cmd_port_index, buf);
               Serial_Forward(cmd_port_index, "ok\n");
 

diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c
@@ -643,7 +643,7 @@ void parseACK(void)
       speedQuerySetWait(false);
     }
     // parse and store flow rate percentage
-    else if (ack_seen("Flow: "))
+    else if (ack_seen("Flow:"))
     {
       speedSetCurPercent(1, ack_value());
       speedQuerySetWait(false);
@@ -784,22 +784,23 @@ void parseACK(void)
     // Tuning parsed responses
     //----------------------------------------
 
-    // parse and store build volume size
-    else if (ack_seen("work:"))
+    // parse and store soft endstops (M211)
+    else if (GET_BIT(infoMachineSettings.softwareEndstops, 1))  // check "M211 seen" flag
     {
-      if (ack_continue_seen("min:"))
+      if (ack_seen("Min:"))
       {
-        if (ack_continue_seen("x:")) infoSettings.machine_size_min[X_AXIS] = ack_value();
-        if (ack_continue_seen("y:")) infoSettings.machine_size_min[Y_AXIS] = ack_value();
-        if (ack_continue_seen("z:")) infoSettings.machine_size_min[Z_AXIS] = ack_value();
-      }
+        // check endstop minimum values
+        if (ack_continue_seen("X")) infoSettings.endstop_min[X_AXIS] = ack_value();
+        if (ack_continue_seen("Y")) infoSettings.endstop_min[Y_AXIS] = ack_value();
+        if (ack_continue_seen("Z")) infoSettings.endstop_min[Z_AXIS] = ack_value();
 
-      if (ack_continue_seen("max:"))
-      {
-        if (ack_continue_seen("x:")) infoSettings.machine_size_max[X_AXIS] = ack_value();
-        if (ack_continue_seen("y:")) infoSettings.machine_size_max[Y_AXIS] = ack_value();
-        if (ack_continue_seen("z:")) infoSettings.machine_size_max[Z_AXIS] = ack_value();
+        // check endstop maximum values
+        if (ack_continue_seen("X")) infoSettings.endstop_max[X_AXIS] = ack_value();
+        if (ack_continue_seen("Y")) infoSettings.endstop_max[Y_AXIS] = ack_value();
+        if (ack_continue_seen("Z")) infoSettings.endstop_max[Z_AXIS] = ack_value();
       }
+
+      SET_BIT_OFF(infoMachineSettings.softwareEndstops, 1);  // clear "M211 seen" flag
     }
     // parse M48, repeatability test
     else if (ack_starts_with("Mean:"))
@@ -808,22 +809,22 @@ void parseACK(void)
 
       sprintf(tmpMsg, "Mean: %0.5f", ack_value());
 
-      if (ack_continue_seen("Min: "))
-        sprintf(&tmpMsg[strlen(tmpMsg)], "\nMin: %0.5f", ack_value());
-      if (ack_continue_seen("Max: "))
-        sprintf(&tmpMsg[strlen(tmpMsg)], "\nMax: %0.5f", ack_value());
-      if (ack_continue_seen("Range: "))
-        sprintf(&tmpMsg[strlen(tmpMsg)], "\nRange: %0.5f", ack_value());
+      if (ack_continue_seen("Min:"))
+        sprintf(strchr(tmpMsg, '\0'), "\nMin: %0.5f", ack_value());
+      if (ack_continue_seen("Max:"))
+        sprintf(strchr(tmpMsg, '\0'), "\nMax: %0.5f", ack_value());
+      if (ack_continue_seen("Range:"))
+        sprintf(strchr(tmpMsg, '\0'), "\nRange: %0.5f", ack_value());
 
       popupReminder(DIALOG_TYPE_INFO, (uint8_t *)"Repeatability Test", (uint8_t *)tmpMsg);
     }
     // parse M48, standard deviation
-    else if (ack_seen("Standard Deviation: "))
+    else if (ack_seen("Standard Deviation:"))
     {
       char tmpMsg[100];
       char * dialogMsg = (char *)getDialogMsgStr();
 
-      if (memcmp(dialogMsg, "Mean: ", 6) == 0)
+      if (memcmp(dialogMsg, "Mean:", 5) == 0)
       {
         levelingSetProbedPoint(-1, -1, ack_value());  // save probed Z value
         sprintf(tmpMsg, "%s\nStandard Deviation: %0.5f", dialogMsg, ack_value());
@@ -835,10 +836,12 @@ void parseACK(void)
     else if (ack_starts_with("M211") || ack_seen("Soft endstops"))
     {
       uint8_t curValue = infoMachineSettings.softwareEndstops;
-      infoMachineSettings.softwareEndstops = ack_continue_seen("ON");
+      SET_BIT_VALUE(infoMachineSettings.softwareEndstops, 0, ack_continue_seen("ON"));  // set ON/Off bit
 
       if (curValue != infoMachineSettings.softwareEndstops)  // send a notification only if status is changed
         addToast(DIALOG_TYPE_INFO, ack_cache);
+
+      SET_BIT_ON(infoMachineSettings.softwareEndstops, 1);  // set "M211 seen" flag
     }
     // parse M303, PID autotune finished message
     else if (ack_starts_with("PID Autotune finished"))
@@ -916,16 +919,23 @@ void parseACK(void)
       mblUpdateStatus(true);
     }
     // parse G30, feedback to get the 4 corners Z value returned by Marlin for LevelCorner menu
-    else if (ack_seen("Bed X: "))
+    else if (ack_seen("Bed X:"))
     {
       float x = ack_value();
-      float y = 0;
 
-      if (ack_continue_seen("Y: "))
-        y = ack_value();
+      if (ack_continue_seen("Y:"))
+      {
+        float y = ack_value();
 
-      if (ack_continue_seen("Z: "))
-        levelingSetProbedPoint(x, y, ack_value());  // save probed Z value
+        if (ack_continue_seen("Z:"))
+          levelingSetProbedPoint(x, y, ack_value());  // save probed Z value
+      }
+    }
+    // parse G30 coordinate unreachable message
+    else if (ack_seen("Z Probe Past Bed"))
+    {
+      levelingSetProbedPoint(-1, -1, 0);  // cancel waiting for coordinates
+      BUZZER_PLAY(SOUND_ERROR);
     }
     #if DELTA_PROBE_TYPE != 0
       // parse and store Delta calibration settings

diff --git a/TFT/src/User/Configuration.h b/TFT/src/User/Configuration.h
@@ -1,7 +1,7 @@
 #ifndef _CONFIGURATION_H_
 #define _CONFIGURATION_H_
 
-#define CONFIG_VERSION 20230821
+#define CONFIG_VERSION 20231001
 
 //====================================================================================================
 //=============================== Settings Configurable On config.ini ================================
@@ -491,11 +491,11 @@
 #define FAN_MAX {255, 255, 255, 255, 255, 255, 255, 255}  // Default: {255, 255, 255, 255, 255, 255, 255, 255}
 
 /**
- * Machine Size / Build Area
- * The TFT will auto-detect the machine size (min and max) in Marlin firmware (requires
- * enabling "M115_GEOMETRY_REPORT" in Configuration_adv.h in Marlin firmware).
- *   Format: [size_min: X<minimum distance> Y<minimum distance> Z<minimum distance>]
- *           [size_max: X<maximum distance> Y<maximum distance> Z<maximum distance>]
+ * Motion limits
+ * This sets the minimum and maximum motion limits. The TFT can autodetect it from an M211 respone.
+ * For this "MIN/MAX_SOFTWARE_ENDSTOPS" must be enabled in Marlin's "Configuration.h".
+ *   Format: [pos_min: X<minimum coordinate> Y<minimum coordinate> Z<minimum coordinate>]
+ *           [pos_max: X<maximum coordinate> Y<maximum coordinate> Z<maximum coordinate>]
  *   Unit: [distance in mm]
  *   Value range: [min: -2000, max: 2000]
  */