SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make M421 more versatile

Browse source
This commit is contained in:
Scott Lahteine 2020-05-16 20:06:54 -05:00
parent d9593c8ed4
commit d9077e51e8
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Marlin/src/gcode/bedlevel/abl/M421.cpp
View file

@ -36,28 +36,39 @@
#endif #endif
/** /**
* M421: Set a single Mesh Bed Leveling Z coordinate * M421: Set one or more Mesh Bed Leveling Z coordinates
* *
* Usage: * Usage:
* M421 I<xindex> J<yindex> Z<linear> * M421 I<xindex> J<yindex> Z<linear>
* M421 I<xindex> J<yindex> Q<offset> * M421 I<xindex> J<yindex> Q<offset>
*
* - If I is omitted, set the entire row
* - If J is omitted, set the entire column
* - If both I and J are omitted, set all
*/ */
void GcodeSuite::M421() { void GcodeSuite::M421() {
int8_t ix = parser.intval('I', -1), iy = parser.intval('J', -1); int8_t ix = parser.intval('I', -1), iy = parser.intval('J', -1);
const bool hasI = ix >= 0, const bool hasZ = parser.seenval('Z'),
hasJ = iy >= 0, hasQ = !hasZ && parser.seenval('Q');
hasZ = parser.seen('Z'),
hasQ = !hasZ && parser.seen('Q');
if (!hasI || !hasJ || !(hasZ || hasQ)) if (hasZ || hasQ) {
SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS); if (WITHIN(ix, -1, GRID_MAX_POINTS_X - 1) && WITHIN(iy, -1, GRID_MAX_POINTS_Y - 1)) {
else if (!WITHIN(ix, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(iy, 0, GRID_MAX_POINTS_Y - 1)) const float zval = parser.value_linear_units();
SERIAL_ERROR_MSG(STR_ERR_MESH_XY); uint8_t sx = ix >= 0 ? ix : 0, ex = ix >= 0 ? ix : GRID_MAX_POINTS_X - 1,
else { sy = iy >= 0 ? iy : 0, ey = iy >= 0 ? iy : GRID_MAX_POINTS_Y - 1;
z_values[ix][iy] = parser.value_linear_units() + (hasQ ? z_values[ix][iy] : 0); LOOP_S_LE_N(x, sx, ex) {
TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate()); LOOP_S_LE_N(y, sy, ey) {
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, z_values[ix][iy])); z_values[x][y] = zval + (hasQ ? z_values[x][y] : 0);
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(x, y, z_values[x][y]));
}
}
TERN_(ABL_BILINEAR_SUBDIVISION, bed_level_virt_interpolate());
}
else
SERIAL_ERROR_MSG(STR_ERR_MESH_XY);
} }
else
SERIAL_ERROR_MSG(STR_ERR_M421_PARAMETERS);
} }
#endif // AUTO_BED_LEVELING_BILINEAR #endif // AUTO_BED_LEVELING_BILINEAR