|
|
@ -3492,20 +3492,20 @@ inline void gcode_G4() {
|
|
|
|
SERIAL_ECHOPAIR("Probe Offset X:", X_PROBE_OFFSET_FROM_EXTRUDER);
|
|
|
|
SERIAL_ECHOPAIR("Probe Offset X:", X_PROBE_OFFSET_FROM_EXTRUDER);
|
|
|
|
SERIAL_ECHOPAIR(" Y:", Y_PROBE_OFFSET_FROM_EXTRUDER);
|
|
|
|
SERIAL_ECHOPAIR(" Y:", Y_PROBE_OFFSET_FROM_EXTRUDER);
|
|
|
|
SERIAL_ECHOPAIR(" Z:", zprobe_zoffset);
|
|
|
|
SERIAL_ECHOPAIR(" Z:", zprobe_zoffset);
|
|
|
|
#if (X_PROBE_OFFSET_FROM_EXTRUDER > 0)
|
|
|
|
#if X_PROBE_OFFSET_FROM_EXTRUDER > 0
|
|
|
|
SERIAL_ECHOPGM(" (Right");
|
|
|
|
SERIAL_ECHOPGM(" (Right");
|
|
|
|
#elif (X_PROBE_OFFSET_FROM_EXTRUDER < 0)
|
|
|
|
#elif X_PROBE_OFFSET_FROM_EXTRUDER < 0
|
|
|
|
SERIAL_ECHOPGM(" (Left");
|
|
|
|
SERIAL_ECHOPGM(" (Left");
|
|
|
|
#elif (Y_PROBE_OFFSET_FROM_EXTRUDER != 0)
|
|
|
|
#elif Y_PROBE_OFFSET_FROM_EXTRUDER != 0
|
|
|
|
SERIAL_ECHOPGM(" (Middle");
|
|
|
|
SERIAL_ECHOPGM(" (Middle");
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
SERIAL_ECHOPGM(" (Aligned With");
|
|
|
|
SERIAL_ECHOPGM(" (Aligned With");
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if (Y_PROBE_OFFSET_FROM_EXTRUDER > 0)
|
|
|
|
#if Y_PROBE_OFFSET_FROM_EXTRUDER > 0
|
|
|
|
SERIAL_ECHOPGM("-Back");
|
|
|
|
SERIAL_ECHOPGM("-Back");
|
|
|
|
#elif (Y_PROBE_OFFSET_FROM_EXTRUDER < 0)
|
|
|
|
#elif Y_PROBE_OFFSET_FROM_EXTRUDER < 0
|
|
|
|
SERIAL_ECHOPGM("-Front");
|
|
|
|
SERIAL_ECHOPGM("-Front");
|
|
|
|
#elif (X_PROBE_OFFSET_FROM_EXTRUDER != 0)
|
|
|
|
#elif X_PROBE_OFFSET_FROM_EXTRUDER != 0
|
|
|
|
SERIAL_ECHOPGM("-Center");
|
|
|
|
SERIAL_ECHOPGM("-Center");
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
if (zprobe_zoffset < 0)
|
|
|
|
if (zprobe_zoffset < 0)
|
|
|
@ -5109,7 +5109,7 @@ void home_all_axes() { gcode_G28(true); }
|
|
|
|
|
|
|
|
|
|
|
|
const int8_t probe_points = parser.seen('P') ? parser.value_int() : DELTA_CALIBRATION_DEFAULT_POINTS;
|
|
|
|
const int8_t probe_points = parser.seen('P') ? parser.value_int() : DELTA_CALIBRATION_DEFAULT_POINTS;
|
|
|
|
if (!WITHIN(probe_points, 1, 7)) {
|
|
|
|
if (!WITHIN(probe_points, 1, 7)) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?(P)oints is implausible (1-7).");
|
|
|
|
SERIAL_PROTOCOLLNPGM("?(P)oints is implausible (1 to 7).");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|