From a3520b6f01f402989cdb22fa958f9c1f5740dd6e Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 May 2016 16:19:37 -0700 Subject: [PATCH 1/3] More precision in M503 output for MBL's M421 --- Marlin/configuration_store.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp index 0dbcd995b2..8fed0a93e4 100644 --- a/Marlin/configuration_store.cpp +++ b/Marlin/configuration_store.cpp @@ -738,7 +738,8 @@ void Config_PrintSettings(bool forReplay) { CONFIG_ECHO_START; SERIAL_ECHOPAIR(" M421 X", mbl.get_x(x)); SERIAL_ECHOPAIR(" Y", mbl.get_y(y)); - SERIAL_ECHOPAIR(" Z", mbl.z_values[y][x]); + SERIAL_ECHOPGM(" Z"); + SERIAL_PROTOCOL_F(mbl.z_values[y][x], 5); SERIAL_EOL; } } From bc5a547d55722a87d41d2e4ee6ad32ed9db736ba Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 May 2016 16:45:56 -0700 Subject: [PATCH 2/3] More robust MBL index / point conversion --- Marlin/mesh_bed_leveling.cpp | 4 ++-- Marlin/mesh_bed_leveling.h | 33 ++++++++++++++++++--------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/Marlin/mesh_bed_leveling.cpp b/Marlin/mesh_bed_leveling.cpp index d35ed3e4d9..ee70068a1c 100644 --- a/Marlin/mesh_bed_leveling.cpp +++ b/Marlin/mesh_bed_leveling.cpp @@ -31,8 +31,8 @@ void mesh_bed_leveling::reset() { active = 0; z_offset = 0; - for (int y = 0; y < MESH_NUM_Y_POINTS; y++) - for (int x = 0; x < MESH_NUM_X_POINTS; x++) + for (int8_t y = MESH_NUM_Y_POINTS; y--;) + for (int8_t x = MESH_NUM_X_POINTS; x--;) z_values[y][x] = 0; } diff --git a/Marlin/mesh_bed_leveling.h b/Marlin/mesh_bed_leveling.h index ce20247a05..2400fe9ecb 100644 --- a/Marlin/mesh_bed_leveling.h +++ b/Marlin/mesh_bed_leveling.h @@ -37,32 +37,34 @@ void reset(); - float get_x(int i) { return MESH_MIN_X + (MESH_X_DIST) * i; } - float get_y(int i) { return MESH_MIN_Y + (MESH_Y_DIST) * i; } - void set_z(int ix, int iy, float z) { z_values[iy][ix] = z; } + static FORCE_INLINE float get_x(int8_t i) { return MESH_MIN_X + (MESH_X_DIST) * i; } + static FORCE_INLINE float get_y(int8_t i) { return MESH_MIN_Y + (MESH_Y_DIST) * i; } + void set_z(int8_t ix, int8_t iy, float z) { z_values[iy][ix] = z; } - inline void zigzag(int index, int &ix, int &iy) { + inline void zigzag(int8_t index, int8_t &ix, int8_t &iy) { ix = index % (MESH_NUM_X_POINTS); iy = index / (MESH_NUM_X_POINTS); if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag } - void set_zigzag_z(int index, float z) { + void set_zigzag_z(int8_t index, float z) { int ix, iy; zigzag(index, ix, iy); set_z(ix, iy, z); } - int select_x_index(float x) { - int i = 1; - while (x > get_x(i) && i < MESH_NUM_X_POINTS - 1) i++; - return i - 1; + int8_t select_x_index(float x) { + for (uint8_t i = MESH_NUM_X_POINTS; i--;) + if (fabs(x - get_x(i)) <= (MESH_X_DIST) / 2) + return i; + return -1; } - int select_y_index(float y) { - int i = 1; - while (y > get_y(i) && i < MESH_NUM_Y_POINTS - 1) i++; - return i - 1; + int8_t select_y_index(float y) { + for (uint8_t i = MESH_NUM_Y_POINTS; i--;) + if (fabs(y - get_y(i)) <= (MESH_Y_DIST) / 2) + return i; + return -1; } float calc_z0(float a0, float a1, float z1, float a2, float z2) { @@ -72,8 +74,9 @@ } float get_z(float x0, float y0) { - int x_index = select_x_index(x0); - int y_index = select_y_index(y0); + int8_t x_index = select_x_index(x0); + int8_t y_index = select_y_index(y0); + if (x_index < 0 || y_index < 0) return z_offset; float z1 = calc_z0(x0, get_x(x_index), z_values[y_index][x_index], get_x(x_index + 1), z_values[y_index][x_index + 1]); From 13175ce7da7a1cc260e923df3bf81f801fb6438d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 14 May 2016 17:12:44 -0700 Subject: [PATCH 3/3] Fix error checking in M421 --- Marlin/Marlin_main.cpp | 23 +++++++++++++---------- Marlin/language.h | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 5416243f1d..0767979acc 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5851,19 +5851,22 @@ inline void gcode_M410() { stepper.quick_stop(); } if ((hasY = code_seen('Y'))) y = code_value(); if ((hasZ = code_seen('Z'))) z = code_value(); - if (!hasX || !hasY || !hasZ) { - SERIAL_ERROR_START; - SERIAL_ERRORLNPGM(MSG_ERR_M421_REQUIRES_XYZ); - err = true; - } + if (hasX && hasY && hasZ) { - if (x >= MESH_NUM_X_POINTS || y >= MESH_NUM_Y_POINTS) { + int8_t ix = mbl.select_x_index(x), + iy = mbl.select_y_index(y); + + if (ix >= 0 && iy >= 0) + mbl.set_z(ix, iy, z); + else { + SERIAL_ERROR_START; + SERIAL_ERRORLNPGM(MSG_ERR_MESH_XY); + } + } + else { SERIAL_ERROR_START; - SERIAL_ERRORLNPGM(MSG_ERR_MESH_INDEX_OOB); - err = true; + SERIAL_ERRORLNPGM(MSG_ERR_M421_REQUIRES_XYZ); } - - if (!err) mbl.set_z(mbl.select_x_index(x), mbl.select_y_index(y), z); } #endif diff --git a/Marlin/language.h b/Marlin/language.h index 179b1f7109..02f1772218 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -148,7 +148,7 @@ #define MSG_Z_PROBE "z_probe: " #define MSG_ERR_MATERIAL_INDEX "M145 S out of range (0-1)" #define MSG_ERR_M421_REQUIRES_XYZ "M421 requires XYZ parameters" -#define MSG_ERR_MESH_INDEX_OOB "Mesh XY index is out of bounds" +#define MSG_ERR_MESH_XY "Mesh XY 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"