From f5a036510f37da2eb73be9a72fb356791f21d810 Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Sat, 21 May 2016 00:18:09 +0200
Subject: [PATCH] Extend M421 with I and J parameters
Extend M421 with I and J parameters
---
Marlin/Marlin_main.cpp | 17 +++++++++++++++--
Marlin/language.h | 4 ++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 0ebfeff040..cc75ff3ddc 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -5899,12 +5899,16 @@ inline void gcode_M410() { stepper.quick_stop(); }
/**
* M421: Set a single Mesh Bed Leveling Z coordinate
+ * Use either 'M421 X<mm> Y<mm> Z<mm>' or 'M421 I<xindex> J<yindex> Z<mm>'
*/
inline void gcode_M421() {
float x = 0, y = 0, z = 0;
- bool err = false, hasX, hasY, hasZ;
+ int8_t i = 0, j = 0;
+ bool err = false, hasX, hasY, hasZ, hasI, hasJ;
if ((hasX = code_seen('X'))) x = code_value();
if ((hasY = code_seen('Y'))) y = code_value();
+ if ((hasI = code_seen('I'))) i = code_value();
+ if ((hasJ = code_seen('J'))) j = code_value();
if ((hasZ = code_seen('Z'))) z = code_value();
if (hasX && hasY && hasZ) {
@@ -5919,7 +5923,16 @@ inline void gcode_M410() { stepper.quick_stop(); }
SERIAL_ERRORLNPGM(MSG_ERR_MESH_XY);
}
}
- else {
+ else if (hasI && hasJ && hasZ) {
+ if (i >= 0 && i < MESH_NUM_X_POINTS && j >= 0 && j < MESH_NUM_Y_POINTS)
+ mbl.set_z(i, j, z);
+ else {
+ SERIAL_ERROR_START;
+ SERIAL_ERRORLNPGM(MSG_ERR_MESH_XY);
+ }
+ }
+ else
+ {
SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_M421_REQUIRES_XYZ);
}
diff --git a/Marlin/language.h b/Marlin/language.h
index 02f1772218..6ef2154152 100644
--- a/Marlin/language.h
+++ b/Marlin/language.h
@@ -147,8 +147,8 @@
#define MSG_Z2_MAX "z2_max: "
#define MSG_Z_PROBE "z_probe: "
#define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-1)"
-#define MSG_ERR_M421_REQUIRES_XYZ "M421 requires XYZ parameters"
-#define MSG_ERR_MESH_XY "Mesh XY cannot be resolved"
+#define MSG_ERR_M421_REQUIRES_XYZ "M421 requires XYZ or IJZ parameters"
+#define MSG_ERR_MESH_XY "Mesh XY or IJ cannot be resolved"
#define MSG_ERR_M428_TOO_FAR "Too far from reference point"
#define MSG_ERR_M303_DISABLED "PIDTEMP disabled"
#define MSG_M119_REPORT "Reporting endstop status"