0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Small reduction in M421 code

Browse source
This commit is contained in:
Scott Lahteine 2016-05-21 19:06:27 -07:00
parent a4ed988c60
commit 360adc6a3b
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Marlin/Marlin_main.cpp
View file

@ -5904,20 +5904,17 @@ inline void gcode_M410() { stepper.quick_stop(); }
* Use either 'M421 X<mm> Y<mm> Z<mm>' or 'M421 I<xindex> J<yindex> Z<mm>' * Use either 'M421 X<mm> Y<mm> Z<mm>' or 'M421 I<xindex> J<yindex> Z<mm>'
*/ */
inline void gcode_M421() { inline void gcode_M421() {
float x = 0, y = 0, z = 0; int8_t px, py;
int8_t px = 0, py = 0; float z = 0;
bool err = false, hasX, hasY, hasZ, hasI, hasJ; bool hasX, hasY, hasZ, hasI, hasJ;
if ((hasX = code_seen('X'))) x = code_value(); if ((hasX = code_seen('X'))) px = mbl.probe_index_x(code_value());
if ((hasY = code_seen('Y'))) y = code_value(); if ((hasY = code_seen('Y'))) py = mbl.probe_index_y(code_value());
if ((hasZ = code_seen('Z'))) z = code_value();
if ((hasI = code_seen('I'))) px = code_value(); if ((hasI = code_seen('I'))) px = code_value();
if ((hasJ = code_seen('J'))) py = code_value(); if ((hasJ = code_seen('J'))) py = code_value();
if ((hasZ = code_seen('Z'))) z = code_value();
if (hasX && hasY && hasZ) { if (hasX && hasY && hasZ) {
px = mbl.probe_index_x(x);
py = mbl.probe_index_y(y);
if (px >= 0 && py >= 0) if (px >= 0 && py >= 0)
mbl.set_z(px, py, z); mbl.set_z(px, py, z);
else { else {
@ -5935,7 +5932,7 @@ inline void gcode_M410() { stepper.quick_stop(); }
} }
else { else {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORLNPGM(MSG_ERR_M421_REQUIRES_XYZ); SERIAL_ERRORLNPGM(MSG_ERR_M421_PARAMETERS);
} }
} }

2
Marlin/language.h
View file

@ -147,7 +147,7 @@
#define MSG_Z2_MAX "z2_max: " #define MSG_Z2_MAX "z2_max: "
#define MSG_Z_PROBE "z_probe: " #define MSG_Z_PROBE "z_probe: "
#define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-1)" #define MSG_ERR_MATERIAL_INDEX "M145 S<index> out of range (0-1)"
#define MSG_ERR_M421_REQUIRES_XYZ "M421 requires XYZ or IJZ parameters" #define MSG_ERR_M421_PARAMETERS "M421 requires XYZ or IJZ parameters"
#define MSG_ERR_MESH_XY "Mesh XY or IJ cannot be resolved" #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_M428_TOO_FAR "Too far from reference point"
#define MSG_ERR_M303_DISABLED "PIDTEMP disabled" #define MSG_ERR_M303_DISABLED "PIDTEMP disabled"