microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Add M851 X Y probe offsets (#15202)

Browse Source
2.0.x
InsanityAutomation 5 years ago committed by Scott Lahteine
parent ebc9a8a0b0
commit df1e51258a
151 changed files with 1009 additions and 1878 deletions
Show Stats Download Patch File Download Diff File

19
Marlin/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

2
Marlin/src/HAL/HAL_AVR/Servo.cpp
Unescape Escape View File

@ -131,7 +131,7 @@ void initISR(timer16_Sequence_t timer) {
TCCR1A = 0; // normal counting mode TCCR1A = 0; // normal counting mode
TCCR1B = _BV(CS11); // set prescaler of 8 TCCR1B = _BV(CS11); // set prescaler of 8
TCNT1 = 0; // clear the timer count TCNT1 = 0; // clear the timer count
#if defined(__AVR_ATmega8__)|| defined(__AVR_ATmega128__) #if defined(__AVR_ATmega8__) || defined(__AVR_ATmega128__)
SBI(TIFR, OCF1A); // clear any pending interrupts; SBI(TIFR, OCF1A); // clear any pending interrupts;
SBI(TIMSK, OCIE1A); // enable the output compare interrupt SBI(TIMSK, OCIE1A); // enable the output compare interrupt
#else #else

2
Marlin/src/core/language.h
Unescape Escape View File

@ -198,7 +198,7 @@
#define MSG_Z3_MAX "z3_max" #define MSG_Z3_MAX "z3_max"
#define MSG_Z_PROBE "z_probe" #define MSG_Z_PROBE "z_probe"
#define MSG_FILAMENT_RUNOUT_SENSOR "filament" #define MSG_FILAMENT_RUNOUT_SENSOR "filament"
#define MSG_PROBE_Z_OFFSET "Probe Z Offset" #define MSG_PROBE_OFFSET "Probe Offset"
#define MSG_SKEW_MIN "min_skew_factor: " #define MSG_SKEW_MIN "min_skew_factor: "
#define MSG_SKEW_MAX "max_skew_factor: " #define MSG_SKEW_MAX "max_skew_factor: "
#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)"

22
Marlin/src/core/utility.cpp
Unescape Escape View File

@ -79,40 +79,36 @@ void safe_delay(millis_t ms) {
); );
#if HAS_BED_PROBE #if HAS_BED_PROBE
SERIAL_ECHOPAIR( SERIAL_ECHOPAIR("Probe Offset X:", zprobe_offset[X_AXIS], " Y:", zprobe_offset[Y_AXIS], " Z:", zprobe_offset[Z_AXIS]);
"Probe Offset X:" STRINGIFY(X_PROBE_OFFSET_FROM_EXTRUDER) if (zprobe_offset[X_AXIS] > 0)
" Y:" STRINGIFY(Y_PROBE_OFFSET_FROM_EXTRUDER)
" Z:", zprobe_zoffset
);
if ((X_PROBE_OFFSET_FROM_EXTRUDER) > 0)
SERIAL_ECHOPGM(" (Right"); SERIAL_ECHOPGM(" (Right");
else if ((X_PROBE_OFFSET_FROM_EXTRUDER) < 0) else if (zprobe_offset[X_AXIS] < 0)
SERIAL_ECHOPGM(" (Left"); SERIAL_ECHOPGM(" (Left");
else if ((Y_PROBE_OFFSET_FROM_EXTRUDER) != 0) else if (zprobe_offset[Y_AXIS] != 0)
SERIAL_ECHOPGM(" (Middle"); SERIAL_ECHOPGM(" (Middle");
else else
SERIAL_ECHOPGM(" (Aligned With"); SERIAL_ECHOPGM(" (Aligned With");
if ((Y_PROBE_OFFSET_FROM_EXTRUDER) > 0) { if (zprobe_offset[Y_AXIS] > 0) {
#if IS_SCARA #if IS_SCARA
SERIAL_ECHOPGM("-Distal"); SERIAL_ECHOPGM("-Distal");
#else #else
SERIAL_ECHOPGM("-Back"); SERIAL_ECHOPGM("-Back");
#endif #endif
} }
else if ((Y_PROBE_OFFSET_FROM_EXTRUDER) < 0) { else if (zprobe_offset[Y_AXIS] < 0) {
#if IS_SCARA #if IS_SCARA
SERIAL_ECHOPGM("-Proximal"); SERIAL_ECHOPGM("-Proximal");
#else #else
SERIAL_ECHOPGM("-Front"); SERIAL_ECHOPGM("-Front");
#endif #endif
} }
else if ((X_PROBE_OFFSET_FROM_EXTRUDER) != 0) else if (zprobe_offset[X_AXIS] != 0)
SERIAL_ECHOPGM("-Center"); SERIAL_ECHOPGM("-Center");
if (zprobe_zoffset < 0) if (zprobe_offset[Z_AXIS] < 0)
SERIAL_ECHOPGM(" & Below"); SERIAL_ECHOPGM(" & Below");
else if (zprobe_zoffset > 0) else if (zprobe_offset[Z_AXIS] > 0)
SERIAL_ECHOPGM(" & Above"); SERIAL_ECHOPGM(" & Above");
else else
SERIAL_ECHOPGM(" & Same Z as"); SERIAL_ECHOPGM(" & Same Z as");

6
Marlin/src/feature/bedlevel/ubl/ubl.cpp
Unescape Escape View File

@ -177,11 +177,11 @@
serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n")); serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
} }
// Add XY_PROBE_OFFSET_FROM_EXTRUDER because probe_pt() subtracts these when // Add XY probe offset from extruder because probe_pt() subtracts them when
// moving to the xy position to be measured. This ensures better agreement between // moving to the xy position to be measured. This ensures better agreement between
// the current Z position after G28 and the mesh values. // the current Z position after G28 and the mesh values.
const float current_xi = find_closest_x_index(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER), const float current_xi = find_closest_x_index(current_position[X_AXIS] + zprobe_offset[X_AXIS]),
current_yi = find_closest_y_index(current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER); current_yi = find_closest_y_index(current_position[Y_AXIS] + zprobe_offset[Y_AXIS]);
if (!lcd) SERIAL_EOL(); if (!lcd) SERIAL_EOL();
for (int8_t j = GRID_MAX_POINTS_Y - 1; j >= 0; j--) { for (int8_t j = GRID_MAX_POINTS_Y - 1; j >= 0; j--) {

43
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
Unescape Escape View File

@ -290,7 +290,7 @@
* especially better for Delta printers, since it populates the center of the mesh first, allowing for * especially better for Delta printers, since it populates the center of the mesh first, allowing for
* a quicker test print to verify settings. You don't need to populate the entire mesh to use it. * a quicker test print to verify settings. You don't need to populate the entire mesh to use it.
* After all, you don't want to spend a lot of time generating a mesh only to realize the resolution * After all, you don't want to spend a lot of time generating a mesh only to realize the resolution
* or zprobe_zoffset are incorrect. Mesh-generation gathers points starting closest to the nozzle unless * or probe offsets are incorrect. Mesh-generation gathers points starting closest to the nozzle unless
* an (X,Y) coordinate pair is given. * an (X,Y) coordinate pair is given.
* *
* Unified Bed Leveling uses a lot of EEPROM storage to hold its data, and it takes some effort to get * Unified Bed Leveling uses a lot of EEPROM storage to hold its data, and it takes some effort to get
@ -453,7 +453,7 @@
SERIAL_ECHO(g29_y_pos); SERIAL_ECHO(g29_y_pos);
SERIAL_ECHOLNPGM(").\n"); SERIAL_ECHOLNPGM(").\n");
} }
probe_entire_mesh(g29_x_pos + X_PROBE_OFFSET_FROM_EXTRUDER, g29_y_pos + Y_PROBE_OFFSET_FROM_EXTRUDER, probe_entire_mesh(g29_x_pos + zprobe_offset[X_AXIS], g29_y_pos + zprobe_offset[Y_AXIS],
parser.seen('T'), parser.seen('E'), parser.seen('U')); parser.seen('T'), parser.seen('E'), parser.seen('U'));
report_current_position(); report_current_position();
@ -482,8 +482,8 @@
g29_x_pos = X_HOME_POS; g29_x_pos = X_HOME_POS;
g29_y_pos = Y_HOME_POS; g29_y_pos = Y_HOME_POS;
#else // cartesian #else // cartesian
g29_x_pos = X_PROBE_OFFSET_FROM_EXTRUDER > 0 ? X_BED_SIZE : 0; g29_x_pos = zprobe_offset[X_AXIS] > 0 ? X_BED_SIZE : 0;
g29_y_pos = Y_PROBE_OFFSET_FROM_EXTRUDER < 0 ? Y_BED_SIZE : 0; g29_y_pos = zprobe_offset[Y_AXIS] < 0 ? Y_BED_SIZE : 0;
#endif #endif
} }
@ -800,8 +800,8 @@
restore_ubl_active_state_and_leave(); restore_ubl_active_state_and_leave();
do_blocking_move_to_xy( do_blocking_move_to_xy(
constrain(rx - (X_PROBE_OFFSET_FROM_EXTRUDER), MESH_MIN_X, MESH_MAX_X), constrain(rx - zprobe_offset[X_AXIS], MESH_MIN_X, MESH_MAX_X),
constrain(ry - (Y_PROBE_OFFSET_FROM_EXTRUDER), MESH_MIN_Y, MESH_MAX_Y) constrain(ry - zprobe_offset[Y_AXIS], MESH_MIN_Y, MESH_MAX_Y)
); );
} }
@ -1281,8 +1281,8 @@
out_mesh.distance = -99999.9f; out_mesh.distance = -99999.9f;
// Get our reference position. Either the nozzle or probe location. // Get our reference position. Either the nozzle or probe location.
const float px = rx + (probe_as_reference == USE_PROBE_AS_REFERENCE ? X_PROBE_OFFSET_FROM_EXTRUDER : 0), const float px = rx + (probe_as_reference == USE_PROBE_AS_REFERENCE ? zprobe_offset[X_AXIS] : 0),
py = ry + (probe_as_reference == USE_PROBE_AS_REFERENCE ? Y_PROBE_OFFSET_FROM_EXTRUDER : 0); py = ry + (probe_as_reference == USE_PROBE_AS_REFERENCE ? zprobe_offset[Y_AXIS] : 0);
float best_so_far = 99999.99f; float best_so_far = 99999.99f;
@ -1384,22 +1384,17 @@
#include "../../../libs/vector_3.h" #include "../../../libs/vector_3.h"
void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) { void unified_bed_leveling::tilt_mesh_based_on_probed_grid(const bool do_3_pt_leveling) {
constexpr int16_t x_min = _MAX(MIN_PROBE_X, MESH_MIN_X), const float x_min = probe_min_x(), x_max = probe_max_x(),
x_max = _MIN(MAX_PROBE_X, MESH_MAX_X), y_min = probe_min_y(), y_max = probe_max_y(),
y_min = _MAX(MIN_PROBE_Y, MESH_MIN_Y), dx = (x_max - x_min) / (g29_grid_size - 1),
y_max = _MIN(MAX_PROBE_Y, MESH_MAX_Y); dy = (y_max - y_min) / (g29_grid_size - 1);
bool abort_flag = false;
float measured_z; float measured_z;
bool abort_flag = false;
const float dx = float(x_max - x_min) / (g29_grid_size - 1), //float z1, z2, z3; // Needed for algorithm validation below
dy = float(y_max - y_min) / (g29_grid_size - 1);
struct linear_fit_data lsf_results; struct linear_fit_data lsf_results;
//float z1, z2, z3; // Needed for algorithm validation down below.
incremental_LSF_reset(&lsf_results); incremental_LSF_reset(&lsf_results);
if (do_3_pt_leveling) { if (do_3_pt_leveling) {
@ -1478,9 +1473,9 @@
uint16_t total_points = g29_grid_size * g29_grid_size, point_num = 1; uint16_t total_points = g29_grid_size * g29_grid_size, point_num = 1;
for (uint8_t ix = 0; ix < g29_grid_size; ix++) { for (uint8_t ix = 0; ix < g29_grid_size; ix++) {
const float rx = float(x_min) + ix * dx; const float rx = x_min + ix * dx;
for (int8_t iy = 0; iy < g29_grid_size; iy++) { for (int8_t iy = 0; iy < g29_grid_size; iy++) {
const float ry = float(y_min) + dy * (zig_zag ? g29_grid_size - 1 - iy : iy); const float ry = y_min + dy * (zig_zag ? g29_grid_size - 1 - iy : iy);
if (!abort_flag) { if (!abort_flag) {
SERIAL_ECHOLNPAIR("Tilting mesh point ", point_num, "/", total_points, "\n"); SERIAL_ECHOLNPAIR("Tilting mesh point ", point_num, "/", total_points, "\n");
@ -1505,7 +1500,7 @@
DEBUG_ECHOPAIR_F(" correction: ", get_z_correction(rx, ry), 7); DEBUG_ECHOPAIR_F(" correction: ", get_z_correction(rx, ry), 7);
} }
measured_z -= get_z_correction(rx, ry) /* + zprobe_zoffset */ ; measured_z -= get_z_correction(rx, ry) /* + zprobe_offset[Z_AXIS] */ ;
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_F(" final >>>---> ", measured_z, 7); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR_F(" final >>>---> ", measured_z, 7);
@ -1711,13 +1706,13 @@
serial_delay(50); serial_delay(50);
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
SERIAL_ECHOLNPAIR_F("planner.z_fade_height : ", planner.z_fade_height, 4); SERIAL_ECHOLNPAIR_F("Fade Height M420 Z", planner.z_fade_height, 4);
#endif #endif
adjust_mesh_to_mean(g29_c_flag, g29_constant); adjust_mesh_to_mean(g29_c_flag, g29_constant);
#if HAS_BED_PROBE #if HAS_BED_PROBE
SERIAL_ECHOLNPAIR_F("zprobe_zoffset: ", zprobe_zoffset, 7); SERIAL_ECHOLNPAIR_F("Probe Offset M851 Z", zprobe_offset[Z_AXIS], 7);
#endif #endif
SERIAL_ECHOLNPAIR("MESH_MIN_X " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50); SERIAL_ECHOLNPAIR("MESH_MIN_X " STRINGIFY(MESH_MIN_X) "=", MESH_MIN_X); serial_delay(50);

6
Marlin/src/gcode/bedlevel/G42.cpp
Unescape Escape View File

@ -47,10 +47,12 @@ void GcodeSuite::G42() {
set_destination_from_current(); set_destination_from_current();
if (hasI) destination[X_AXIS] = _GET_MESH_X(ix); if (hasI) destination[X_AXIS] = _GET_MESH_X(ix);
if (hasJ) destination[Y_AXIS] = _GET_MESH_Y(iy); if (hasJ) destination[Y_AXIS] = _GET_MESH_Y(iy);
#if HAS_BED_PROBE
if (parser.boolval('P')) { if (parser.boolval('P')) {
if (hasI) destination[X_AXIS] -= X_PROBE_OFFSET_FROM_EXTRUDER; if (hasI) destination[X_AXIS] -= zprobe_offset[X_AXIS];
if (hasJ) destination[Y_AXIS] -= Y_PROBE_OFFSET_FROM_EXTRUDER; if (hasJ) destination[Y_AXIS] -= zprobe_offset[Y_AXIS];
} }
#endif
const float fval = parser.linearval('F'); const float fval = parser.linearval('F');
if (fval > 0.0) feedrate_mm_s = MMM_TO_MMS(fval); if (fval > 0.0) feedrate_mm_s = MMM_TO_MMS(fval);

20
Marlin/src/gcode/bedlevel/M420.cpp
Unescape Escape View File

@ -64,10 +64,12 @@ void GcodeSuite::M420() {
#if ENABLED(MARLIN_DEV_MODE) #if ENABLED(MARLIN_DEV_MODE)
if (parser.intval('S') == 2) { if (parser.intval('S') == 2) {
#if ENABLED(AUTO_BED_LEVELING_BILINEAR) #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
bilinear_start[X_AXIS] = MIN_PROBE_X; const float x_min = probe_min_x(), x_max = probe_max_x(),
bilinear_start[Y_AXIS] = MIN_PROBE_Y; y_min = probe_min_y(), y_max = probe_max_y();
bilinear_grid_spacing[X_AXIS] = (MAX_PROBE_X - (MIN_PROBE_X)) / (GRID_MAX_POINTS_X - 1); bilinear_start[X_AXIS] = x_min;
bilinear_grid_spacing[Y_AXIS] = (MAX_PROBE_Y - (MIN_PROBE_Y)) / (GRID_MAX_POINTS_Y - 1); bilinear_start[Y_AXIS] = y_min;
bilinear_grid_spacing[X_AXIS] = (x_max - x_min) / (GRID_MAX_POINTS_X - 1);
bilinear_grid_spacing[Y_AXIS] = (y_max - y_min) / (GRID_MAX_POINTS_Y - 1);
#endif #endif
for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++) for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) { for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++) {
@ -76,11 +78,11 @@ void GcodeSuite::M420() {
ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y)); ExtUI::onMeshUpdate(x, y, Z_VALUES(x, y));
#endif #endif
} }
SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_X) " mesh "); SERIAL_ECHOPGM("Simulated " STRINGIFY(GRID_MAX_POINTS_X) "x" STRINGIFY(GRID_MAX_POINTS_Y) " mesh ");
SERIAL_ECHOPAIR(" (", MIN_PROBE_X); SERIAL_ECHOPAIR(" (", x_min);
SERIAL_CHAR(','); SERIAL_ECHO(MIN_PROBE_Y); SERIAL_CHAR(','); SERIAL_ECHO(y_min);
SERIAL_ECHOPAIR(")-(", MAX_PROBE_X); SERIAL_ECHOPAIR(")-(", x_max);
SERIAL_CHAR(','); SERIAL_ECHO(MAX_PROBE_Y); SERIAL_CHAR(','); SERIAL_ECHO(y_max);
SERIAL_ECHOLNPGM(")"); SERIAL_ECHOLNPGM(")");
} }
#endif #endif

20
Marlin/src/gcode/bedlevel/abl/G29.cpp
Unescape Escape View File

@ -393,16 +393,16 @@ G29_TYPE GcodeSuite::G29() {
if (parser.seen('H')) { if (parser.seen('H')) {
const int16_t size = (int16_t)parser.value_linear_units(); const int16_t size = (int16_t)parser.value_linear_units();
left_probe_bed_position = _MAX(X_CENTER - size / 2, MIN_PROBE_X); left_probe_bed_position = _MAX(X_CENTER - size / 2, probe_min_x());
right_probe_bed_position = _MIN(left_probe_bed_position + size, MAX_PROBE_X); right_probe_bed_position = _MIN(left_probe_bed_position + size, probe_max_x());
front_probe_bed_position = _MAX(Y_CENTER - size / 2, MIN_PROBE_Y); front_probe_bed_position = _MAX(Y_CENTER - size / 2, probe_min_y());
back_probe_bed_position = _MIN(front_probe_bed_position + size, MAX_PROBE_Y); back_probe_bed_position = _MIN(front_probe_bed_position + size, probe_max_y());
} }
else { else {
left_probe_bed_position = parser.seenval('L') ? (int)RAW_X_POSITION(parser.value_linear_units()) : LEFT_PROBE_BED_POSITION; left_probe_bed_position = parser.seenval('L') ? (int)RAW_X_POSITION(parser.value_linear_units()) : _MAX(X_CENTER - X_BED_SIZE / 2, probe_min_x());
right_probe_bed_position = parser.seenval('R') ? (int)RAW_X_POSITION(parser.value_linear_units()) : RIGHT_PROBE_BED_POSITION; right_probe_bed_position = parser.seenval('R') ? (int)RAW_X_POSITION(parser.value_linear_units()) : _MIN(left_probe_bed_position + X_BED_SIZE, probe_max_x());
front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION; front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : _MAX(Y_CENTER - Y_BED_SIZE / 2, probe_min_y());
back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION; back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : _MIN(front_probe_bed_position + Y_BED_SIZE, probe_max_y());
} }
if ( if (
@ -947,8 +947,8 @@ G29_TYPE GcodeSuite::G29() {
planner.leveling_active = false; planner.leveling_active = false;
// Use the last measured distance to the bed, if possible // Use the last measured distance to the bed, if possible
if ( NEAR(current_position[X_AXIS], xProbe - (X_PROBE_OFFSET_FROM_EXTRUDER)) if ( NEAR(current_position[X_AXIS], xProbe - zprobe_offset[X_AXIS])
&& NEAR(current_position[Y_AXIS], yProbe - (Y_PROBE_OFFSET_FROM_EXTRUDER)) && NEAR(current_position[Y_AXIS], yProbe - zprobe_offset[Y_AXIS])
) { ) {
const float simple_z = current_position[Z_AXIS] - measured_z; const float simple_z = current_position[Z_AXIS] - measured_z;
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probed Z", simple_z, " Matrix Z", converted[Z_AXIS], " Discrepancy ", simple_z - converted[Z_AXIS]); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("Probed Z", simple_z, " Matrix Z", converted[Z_AXIS], " Discrepancy ", simple_z - converted[Z_AXIS]);

4
Marlin/src/gcode/calibrate/G28.cpp
Unescape Escape View File

@ -136,8 +136,8 @@
destination[Z_AXIS] = current_position[Z_AXIS]; // Z is already at the right height destination[Z_AXIS] = current_position[Z_AXIS]; // Z is already at the right height
#if HOMING_Z_WITH_PROBE #if HOMING_Z_WITH_PROBE
destination[X_AXIS] -= X_PROBE_OFFSET_FROM_EXTRUDER; destination[X_AXIS] -= zprobe_offset[X_AXIS];
destination[Y_AXIS] -= Y_PROBE_OFFSET_FROM_EXTRUDER; destination[Y_AXIS] -= zprobe_offset[Y_AXIS];
#endif #endif
if (position_is_reachable(destination[X_AXIS], destination[Y_AXIS])) { if (position_is_reachable(destination[X_AXIS], destination[Y_AXIS])) {

8
Marlin/src/gcode/calibrate/M48.cpp
Unescape Escape View File

@ -77,8 +77,8 @@ void GcodeSuite::M48() {
float X_current = current_position[X_AXIS], float X_current = current_position[X_AXIS],
Y_current = current_position[Y_AXIS]; Y_current = current_position[Y_AXIS];
const float X_probe_location = parser.linearval('X', X_current + X_PROBE_OFFSET_FROM_EXTRUDER), const float X_probe_location = parser.linearval('X', X_current + zprobe_offset[X_AXIS]),
Y_probe_location = parser.linearval('Y', Y_current + Y_PROBE_OFFSET_FROM_EXTRUDER); Y_probe_location = parser.linearval('Y', Y_current + zprobe_offset[Y_AXIS]);
if (!position_is_reachable_by_probe(X_probe_location, Y_probe_location)) { if (!position_is_reachable_by_probe(X_probe_location, Y_probe_location)) {
SERIAL_ECHOLNPGM("? (X,Y) out of bounds."); SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");
@ -165,8 +165,8 @@ void GcodeSuite::M48() {
while (angle < 0.0) angle += 360.0; // outside of this range. It looks like they behave correctly with while (angle < 0.0) angle += 360.0; // outside of this range. It looks like they behave correctly with
// numbers outside of the range, but just to be safe we clamp them. // numbers outside of the range, but just to be safe we clamp them.
X_current = X_probe_location - (X_PROBE_OFFSET_FROM_EXTRUDER) + cos(RADIANS(angle)) * radius; X_current = X_probe_location - zprobe_offset[X_AXIS] + cos(RADIANS(angle)) * radius;
Y_current = Y_probe_location - (Y_PROBE_OFFSET_FROM_EXTRUDER) + sin(RADIANS(angle)) * radius; Y_current = Y_probe_location - zprobe_offset[Y_AXIS] + sin(RADIANS(angle)) * radius;
#if DISABLED(DELTA) #if DISABLED(DELTA)
LIMIT(X_current, X_MIN_POS, X_MAX_POS); LIMIT(X_current, X_MIN_POS, X_MAX_POS);

2
Marlin/src/gcode/gcode.h
Unescape Escape View File

@ -229,7 +229,7 @@
* M701 - Load filament (Requires FILAMENT_LOAD_UNLOAD_GCODES) * M701 - Load filament (Requires FILAMENT_LOAD_UNLOAD_GCODES)
* M702 - Unload filament (Requires FILAMENT_LOAD_UNLOAD_GCODES) * M702 - Unload filament (Requires FILAMENT_LOAD_UNLOAD_GCODES)
* M810-M819 - Define/execute a G-code macro (Requires GCODE_MACROS) * M810-M819 - Define/execute a G-code macro (Requires GCODE_MACROS)
* M851 - Set Z probe's Z offset in current units. (Negative = below the nozzle.) * M851 - Set Z probe's XYZ offsets in current units. (Negative values: X=left, Y=front, Z=below)
* M852 - Set skew factors: "M852 [I<xy>] [J<xz>] [K<yz>]". (Requires SKEW_CORRECTION_GCODE, and SKEW_CORRECTION_FOR_Z for IJ) * M852 - Set skew factors: "M852 [I<xy>] [J<xz>] [K<yz>]". (Requires SKEW_CORRECTION_GCODE, and SKEW_CORRECTION_FOR_Z for IJ)
* M860 - Report the position of position encoder modules. * M860 - Report the position of position encoder modules.
* M861 - Report the status of position encoder modules. * M861 - Report the status of position encoder modules.

4
Marlin/src/gcode/motion/M290.cpp
Unescape Escape View File

@ -42,9 +42,9 @@
&& active_extruder == 0 && active_extruder == 0
#endif #endif
) { ) {
zprobe_zoffset += offs; zprobe_offset[Z_AXIS] += offs;
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR(MSG_PROBE_Z_OFFSET ": ", zprobe_zoffset); SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET MSG_Z ": ", zprobe_offset[Z_AXIS]);
} }
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET) #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
else { else {

4
Marlin/src/gcode/probe/G30.cpp
Unescape Escape View File

@ -39,8 +39,8 @@
* E Engage the probe for each probe (default 1) * E Engage the probe for each probe (default 1)
*/ */
void GcodeSuite::G30() { void GcodeSuite::G30() {
const float xpos = parser.linearval('X', current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER), const float xpos = parser.linearval('X', current_position[X_AXIS] + zprobe_offset[X_AXIS]),
ypos = parser.linearval('Y', current_position[Y_AXIS] + Y_PROBE_OFFSET_FROM_EXTRUDER); ypos = parser.linearval('Y', current_position[Y_AXIS] + zprobe_offset[Y_AXIS]);
if (!position_is_reachable_by_probe(xpos, ypos)) return; if (!position_is_reachable_by_probe(xpos, ypos)) return;

40
Marlin/src/gcode/probe/M851.cpp
Unescape Escape View File

@ -28,17 +28,43 @@
#include "../../feature/bedlevel/bedlevel.h" #include "../../feature/bedlevel/bedlevel.h"
#include "../../module/probe.h" #include "../../module/probe.h"
/**
* M851: Set the nozzle-to-probe offsets in current units
*/
void GcodeSuite::M851() { void GcodeSuite::M851() {
if (parser.seenval('Z')) {
const float value = parser.value_linear_units(); // Show usage with no parameters
if (WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) if (!parser.seen("XYZ")) {
zprobe_zoffset = value; SERIAL_ECHO_START();
else SERIAL_ECHOLNPAIR(MSG_PROBE_OFFSET " X", zprobe_offset[X_AXIS],
" Y", zprobe_offset[Y_AXIS],
" Z", zprobe_offset[Z_AXIS]);
return;
}
// Get the modified offsets
const float offs[] = {
parser.floatval('X', zprobe_offset[X_AXIS]),
parser.floatval('Y', zprobe_offset[Y_AXIS]),
parser.floatval('Z', zprobe_offset[Z_AXIS])
};
// Error-check
if (!WITHIN(offs[X_AXIS], -(X_BED_SIZE), X_BED_SIZE)) {
SERIAL_ERROR_MSG("?X out of range (-" STRINGIFY(X_BED_SIZE) " to " STRINGIFY(X_BED_SIZE) ")");
return;
}
if (!WITHIN(offs[Y_AXIS], -(Y_BED_SIZE), Y_BED_SIZE)) {
SERIAL_ERROR_MSG("?Y out of range (-" STRINGIFY(Y_BED_SIZE) " to " STRINGIFY(Y_BED_SIZE) ")");
return;
}
if (!WITHIN(offs[Z_AXIS], Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) {
SERIAL_ERROR_MSG("?Z out of range (" STRINGIFY(Z_PROBE_OFFSET_RANGE_MIN) " to " STRINGIFY(Z_PROBE_OFFSET_RANGE_MAX) ")"); SERIAL_ERROR_MSG("?Z out of range (" STRINGIFY(Z_PROBE_OFFSET_RANGE_MIN) " to " STRINGIFY(Z_PROBE_OFFSET_RANGE_MAX) ")");
return; return;
} }
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR(MSG_PROBE_Z_OFFSET ": ", zprobe_zoffset); // Save the new offsets
LOOP_XYZ(a) zprobe_offset[a] = offs[a];
} }
#endif // HAS_BED_PROBE #endif // HAS_BED_PROBE

95
Marlin/src/inc/Conditionals_post.h
Unescape Escape View File

@ -1348,12 +1348,7 @@
#endif #endif
#endif #endif
#else #else
#undef X_PROBE_OFFSET_FROM_EXTRUDER #undef NOZZLE_TO_PROBE_OFFSET
#undef Y_PROBE_OFFSET_FROM_EXTRUDER
#undef Z_PROBE_OFFSET_FROM_EXTRUDER
#define X_PROBE_OFFSET_FROM_EXTRUDER 0
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0
#endif #endif
/** /**
@ -1446,10 +1441,13 @@
* Bed Probing rectangular bounds * Bed Probing rectangular bounds
* These can be further constrained in code for Delta and SCARA * These can be further constrained in code for Delta and SCARA
*/ */
#ifndef MIN_PROBE_EDGE #ifndef MIN_PROBE_EDGE
#define MIN_PROBE_EDGE 0 #define MIN_PROBE_EDGE 0
#endif #endif
#ifndef NOZZLE_TO_PROBE_OFFSET
#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#endif
constexpr float nozzle_to_probe_offset[XYZ] = NOZZLE_TO_PROBE_OFFSET;
#if ENABLED(DELTA) #if ENABLED(DELTA)
/** /**
@ -1457,8 +1455,8 @@
*/ */
#define _PROBE_RADIUS (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE)) #define _PROBE_RADIUS (DELTA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
#ifndef DELTA_CALIBRATION_RADIUS #ifndef DELTA_CALIBRATION_RADIUS
#ifdef X_PROBE_OFFSET_FROM_EXTRUDER #ifdef NOZZLE_TO_PROBE_OFFSET
#define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - _MAX(ABS(X_PROBE_OFFSET_FROM_EXTRUDER), ABS(Y_PROBE_OFFSET_FROM_EXTRUDER), ABS(MIN_PROBE_EDGE))) #define DELTA_CALIBRATION_RADIUS (DELTA_PRINTABLE_RADIUS - _MAX(ABS(nozzle_to_probe_offset[X_AXIS]), ABS(nozzle_to_probe_offset[Y_AXIS]), ABS(MIN_PROBE_EDGE)))
#else #else
#define DELTA_CALIBRATION_RADIUS _PROBE_RADIUS #define DELTA_CALIBRATION_RADIUS _PROBE_RADIUS
#endif #endif
@ -1467,39 +1465,39 @@
#define DELTA_ENDSTOP_ADJ { 0, 0, 0 } #define DELTA_ENDSTOP_ADJ { 0, 0, 0 }
#endif #endif
#ifndef DELTA_TOWER_ANGLE_TRIM #ifndef DELTA_TOWER_ANGLE_TRIM
#define DELTA_TOWER_ANGLE_TRIM {0, 0, 0} #define DELTA_TOWER_ANGLE_TRIM { 0, 0, 0 }
#endif #endif
#ifndef DELTA_RADIUS_TRIM_TOWER #ifndef DELTA_RADIUS_TRIM_TOWER
#define DELTA_RADIUS_TRIM_TOWER {0, 0, 0} #define DELTA_RADIUS_TRIM_TOWER { 0, 0, 0 }
#endif #endif
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER #ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER
#define DELTA_DIAGONAL_ROD_TRIM_TOWER {0, 0, 0} #define DELTA_DIAGONAL_ROD_TRIM_TOWER { 0, 0, 0 }
#endif #endif
// Probing points may be verified at compile time within the radius // Probing points may be verified at compile time within the radius
// using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!") // using static_assert(HYPOT2(X2-X1,Y2-Y1)<=sq(DELTA_PRINTABLE_RADIUS),"bad probe point!")
// so that may be added to SanityCheck.h in the future. // so that may be added to SanityCheck.h in the future.
#define _MIN_PROBE_X (X_CENTER - (_PROBE_RADIUS)) #define PROBE_X_MIN (X_CENTER - (_PROBE_RADIUS))
#define _MIN_PROBE_Y (Y_CENTER - (_PROBE_RADIUS)) #define PROBE_Y_MIN (Y_CENTER - (_PROBE_RADIUS))
#define _MAX_PROBE_X (X_CENTER + _PROBE_RADIUS) #define PROBE_X_MAX (X_CENTER + _PROBE_RADIUS)
#define _MAX_PROBE_Y (Y_CENTER + _PROBE_RADIUS) #define PROBE_Y_MAX (Y_CENTER + _PROBE_RADIUS)
#elif IS_SCARA #elif IS_SCARA
#define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2) #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
#define _PROBE_RADIUS (SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE)) #define _PROBE_RADIUS (SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
#define _MIN_PROBE_X (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE) #define PROBE_X_MIN (X_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
#define _MIN_PROBE_Y (Y_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE) #define PROBE_Y_MIN (Y_CENTER - (SCARA_PRINTABLE_RADIUS) + MIN_PROBE_EDGE)
#define _MAX_PROBE_X (X_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE)) #define PROBE_X_MAX (X_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
#define _MAX_PROBE_Y (Y_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE)) #define PROBE_Y_MAX (Y_CENTER + SCARA_PRINTABLE_RADIUS - (MIN_PROBE_EDGE))
#else #else
// Boundaries for Cartesian probing based on bed limits // Boundaries for Cartesian probing based on bed limits
#define _MIN_PROBE_X (_MAX(X_MIN_BED + MIN_PROBE_EDGE, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER)) #define PROBE_X_MIN (_MAX(X_MIN_BED + MIN_PROBE_EDGE, X_MIN_POS + nozzle_to_probe_offset[X_AXIS]))
#define _MIN_PROBE_Y (_MAX(Y_MIN_BED + MIN_PROBE_EDGE, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER)) #define PROBE_Y_MIN (_MAX(Y_MIN_BED + MIN_PROBE_EDGE, Y_MIN_POS + nozzle_to_probe_offset[Y_AXIS]))
#define _MAX_PROBE_X (_MIN(X_MAX_BED - (MIN_PROBE_EDGE), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER)) #define PROBE_X_MAX (_MIN(X_MAX_BED - (MIN_PROBE_EDGE), X_MAX_POS + nozzle_to_probe_offset[X_AXIS]))
#define _MAX_PROBE_Y (_MIN(Y_MAX_BED - (MIN_PROBE_EDGE), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER)) #define PROBE_Y_MAX (_MIN(Y_MAX_BED - (MIN_PROBE_EDGE), Y_MAX_POS + nozzle_to_probe_offset[Y_AXIS]))
#endif #endif
@ -1507,20 +1505,6 @@
#define LEVELED_SEGMENT_LENGTH 5 #define LEVELED_SEGMENT_LENGTH 5
#endif #endif
// These may be overridden in Configuration.h if a smaller area is desired
#ifndef MIN_PROBE_X
#define MIN_PROBE_X _MIN_PROBE_X
#endif
#ifndef MIN_PROBE_Y
#define MIN_PROBE_Y _MIN_PROBE_Y
#endif
#ifndef MAX_PROBE_X
#define MAX_PROBE_X _MAX_PROBE_X
#endif
#ifndef MAX_PROBE_Y
#define MAX_PROBE_Y _MAX_PROBE_Y
#endif
/** /**
* Default mesh area is an area with an inset margin on the print area. * Default mesh area is an area with an inset margin on the print area.
*/ */
@ -1537,14 +1521,14 @@
// Boundaries for Cartesian probing based on set limits // Boundaries for Cartesian probing based on set limits
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
#define _MESH_MIN_X (_MAX(X_MIN_BED + MESH_INSET, X_MIN_POS)) // UBL is careful not to probe off the bed. It does not #define _MESH_MIN_X (_MAX(X_MIN_BED + MESH_INSET, X_MIN_POS)) // UBL is careful not to probe off the bed. It does not
#define _MESH_MIN_Y (_MAX(Y_MIN_BED + MESH_INSET, Y_MIN_POS)) // need *_PROBE_OFFSET_FROM_EXTRUDER in the mesh dimensions #define _MESH_MIN_Y (_MAX(Y_MIN_BED + MESH_INSET, Y_MIN_POS)) // need NOZZLE_TO_PROBE_OFFSET in the mesh dimensions
#define _MESH_MAX_X (_MIN(X_MAX_BED - (MESH_INSET), X_MAX_POS)) #define _MESH_MAX_X (_MIN(X_MAX_BED - (MESH_INSET), X_MAX_POS))
#define _MESH_MAX_Y (_MIN(Y_MAX_BED - (MESH_INSET), Y_MAX_POS)) #define _MESH_MAX_Y (_MIN(Y_MAX_BED - (MESH_INSET), Y_MAX_POS))
#else #else
#define _MESH_MIN_X (_MAX(X_MIN_BED + MESH_INSET, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER)) #define _MESH_MIN_X (_MAX(X_MIN_BED + MESH_INSET, X_MIN_POS + nozzle_to_probe_offset[X_AXIS]))
#define _MESH_MIN_Y (_MAX(Y_MIN_BED + MESH_INSET, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER)) #define _MESH_MIN_Y (_MAX(Y_MIN_BED + MESH_INSET, Y_MIN_POS + nozzle_to_probe_offset[Y_AXIS]))
#define _MESH_MAX_X (_MIN(X_MAX_BED - (MESH_INSET), X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER)) #define _MESH_MAX_X (_MIN(X_MAX_BED - (MESH_INSET), X_MAX_POS + nozzle_to_probe_offset[X_AXIS]))
#define _MESH_MAX_Y (_MIN(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER)) #define _MESH_MAX_Y (_MIN(Y_MAX_BED - (MESH_INSET), Y_MAX_POS + nozzle_to_probe_offset[Y_AXIS]))
#endif #endif
#endif #endif
@ -1592,38 +1576,23 @@
#endif #endif
#else #else
#ifndef PROBE_PT_1_X #ifndef PROBE_PT_1_X
#define PROBE_PT_1_X MIN_PROBE_X #define PROBE_PT_1_X PROBE_X_MIN
#endif #endif
#ifndef PROBE_PT_1_Y #ifndef PROBE_PT_1_Y
#define PROBE_PT_1_Y MIN_PROBE_Y #define PROBE_PT_1_Y PROBE_Y_MIN
#endif #endif
#ifndef PROBE_PT_2_X #ifndef PROBE_PT_2_X
#define PROBE_PT_2_X MAX_PROBE_X #define PROBE_PT_2_X PROBE_X_MAX
#endif #endif
#ifndef PROBE_PT_2_Y #ifndef PROBE_PT_2_Y
#define PROBE_PT_2_Y MIN_PROBE_Y #define PROBE_PT_2_Y PROBE_Y_MIN
#endif #endif
#ifndef PROBE_PT_3_X #ifndef PROBE_PT_3_X
#define PROBE_PT_3_X X_CENTER #define PROBE_PT_3_X X_CENTER
#endif #endif
#ifndef PROBE_PT_3_Y #ifndef PROBE_PT_3_Y
#define PROBE_PT_3_Y MAX_PROBE_Y #define PROBE_PT_3_Y PROBE_Y_MAX
#endif
#endif
#endif
#if EITHER(AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR)
#ifndef LEFT_PROBE_BED_POSITION
#define LEFT_PROBE_BED_POSITION MIN_PROBE_X
#endif
#ifndef RIGHT_PROBE_BED_POSITION
#define RIGHT_PROBE_BED_POSITION MAX_PROBE_X
#endif
#ifndef FRONT_PROBE_BED_POSITION
#define FRONT_PROBE_BED_POSITION MIN_PROBE_Y
#endif #endif
#ifndef BACK_PROBE_BED_POSITION
#define BACK_PROBE_BED_POSITION MAX_PROBE_Y
#endif #endif
#endif #endif

48
Marlin/src/inc/SanityCheck.h
Unescape Escape View File

@ -390,6 +390,10 @@
#error "STRING_SPLASH_LINE[12] are now obsolete. Please remove them from Configuration.h." #error "STRING_SPLASH_LINE[12] are now obsolete. Please remove them from Configuration.h."
#elif defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_X) || defined(Z_PROBE_ALLEN_KEY_STOW_1_X) #elif defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_X) || defined(Z_PROBE_ALLEN_KEY_STOW_1_X)
#error "Z_PROBE_ALLEN_KEY_(DEPLOY|STOW) coordinates are now a single setting. Please update your configuration." #error "Z_PROBE_ALLEN_KEY_(DEPLOY|STOW) coordinates are now a single setting. Please update your configuration."
#elif defined(X_PROBE_OFFSET_FROM_EXTRUDER) || defined(Y_PROBE_OFFSET_FROM_EXTRUDER) || defined(Z_PROBE_OFFSET_FROM_EXTRUDER)
#error "[XYZ]_PROBE_OFFSET_FROM_EXTRUDER is now NOZZLE_TO_PROBE_OFFSET. Please update your configuration."
#elif defined(MIN_PROBE_X) || defined(MIN_PROBE_Y) || defined(MAX_PROBE_X) || defined(MAX_PROBE_Y)
#error "(MIN|MAX)_PROBE_[XY] are now calculated at runtime. Please remove them from Configuration.h."
#endif #endif
#define BOARD_MKS_13 -1000 #define BOARD_MKS_13 -1000
@ -1051,9 +1055,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#if HAS_BED_PROBE #if HAS_BED_PROBE
static_assert(FLOOR(float(X_PROBE_OFFSET_FROM_EXTRUDER)) == float(X_PROBE_OFFSET_FROM_EXTRUDER), "X_PROBE_OFFSET_FROM_EXTRUDER must be an integer!");
static_assert(FLOOR(float(Y_PROBE_OFFSET_FROM_EXTRUDER)) == float(Y_PROBE_OFFSET_FROM_EXTRUDER), "Y_PROBE_OFFSET_FROM_EXTRUDER must be an integer!");
/** /**
* Z_PROBE_SLED is incompatible with DELTA * Z_PROBE_SLED is incompatible with DELTA
*/ */
@ -1205,14 +1206,18 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
* Bed Leveling Requirements * Bed Leveling Requirements
*/ */
#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT) //
static_assert(WITHIN(PROBE_PT_1_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_1_X is outside the probe region."); // !! TODO: REPLACE WITH TESTS IN THE 3-POINT LEVELING CODE !!
static_assert(WITHIN(PROBE_PT_2_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_2_X is outside the probe region."); //
static_assert(WITHIN(PROBE_PT_3_X, MIN_PROBE_X, MAX_PROBE_X), "PROBE_PT_3_X is outside the probe region.");
static_assert(WITHIN(PROBE_PT_1_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_1_Y is outside the probe region."); //#if EITHER(AUTO_BED_LEVELING_UBL, AUTO_BED_LEVELING_3POINT)
static_assert(WITHIN(PROBE_PT_2_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_2_Y is outside the probe region."); // static_assert(WITHIN(PROBE_PT_1_X, PROBE_X_MIN, PROBE_X_MAX), "PROBE_PT_1_X is outside the probe region.");
static_assert(WITHIN(PROBE_PT_3_Y, MIN_PROBE_Y, MAX_PROBE_Y), "PROBE_PT_3_Y is outside the probe region."); // static_assert(WITHIN(PROBE_PT_2_X, PROBE_X_MIN, PROBE_X_MAX), "PROBE_PT_2_X is outside the probe region.");
#endif // static_assert(WITHIN(PROBE_PT_3_X, PROBE_X_MIN, PROBE_X_MAX), "PROBE_PT_3_X is outside the probe region.");
// static_assert(WITHIN(PROBE_PT_1_Y, PROBE_Y_MIN, PROBE_Y_MAX), "PROBE_PT_1_Y is outside the probe region.");
// static_assert(WITHIN(PROBE_PT_2_Y, PROBE_Y_MIN, PROBE_Y_MAX), "PROBE_PT_2_Y is outside the probe region.");
// static_assert(WITHIN(PROBE_PT_3_Y, PROBE_Y_MIN, PROBE_Y_MAX), "PROBE_PT_3_Y is outside the probe region.");
//#endif
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
@ -1246,20 +1251,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "SCARA machines can only use the AUTO_BED_LEVELING_BILINEAR leveling option." #error "SCARA machines can only use the AUTO_BED_LEVELING_BILINEAR leveling option."
#endif #endif
/**
* Check auto bed leveling probe points
*/
#if ABL_GRID
static_assert(LEFT_PROBE_BED_POSITION < RIGHT_PROBE_BED_POSITION, "LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION.");
static_assert(FRONT_PROBE_BED_POSITION < BACK_PROBE_BED_POSITION, "FRONT_PROBE_BED_POSITION must be less than BACK_PROBE_BED_POSITION.");
static_assert(LEFT_PROBE_BED_POSITION >= MIN_PROBE_X, "LEFT_PROBE_BED_POSITION is outside the probe region.");
static_assert(RIGHT_PROBE_BED_POSITION <= MAX_PROBE_X, "RIGHT_PROBE_BED_POSITION is outside the probe region.");
static_assert(FRONT_PROBE_BED_POSITION >= MIN_PROBE_Y, "FRONT_PROBE_BED_POSITION is outside the probe region.");
static_assert(BACK_PROBE_BED_POSITION <= MAX_PROBE_Y, "BACK_PROBE_BED_POSITION is outside the probe region.");
#endif
#elif ENABLED(MESH_BED_LEVELING) #elif ENABLED(MESH_BED_LEVELING)
// Hide PROBE_MANUALLY from the rest of the code // Hide PROBE_MANUALLY from the rest of the code
@ -1328,8 +1319,11 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
*/ */
#if ENABLED(Z_SAFE_HOMING) #if ENABLED(Z_SAFE_HOMING)
#if HAS_BED_PROBE #if HAS_BED_PROBE
static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, MIN_PROBE_X, MAX_PROBE_X), "Z_SAFE_HOMING_X_POINT is outside the probe region."); //
static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, MIN_PROBE_Y, MAX_PROBE_Y), "Z_SAFE_HOMING_Y_POINT is outside the probe region."); // !! TODO: REPLACE WITH TESTS IN THE Z_SAFE_HOMING CODE !!
//
//static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, PROBE_X_MIN, PROBE_X_MAX), "Z_SAFE_HOMING_X_POINT is outside the probe region.");
//static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, PROBE_Y_MIN, PROBE_Y_MAX), "Z_SAFE_HOMING_Y_POINT is outside the probe region.");
#else #else
static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle."); static_assert(WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle."); static_assert(WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");

6
Marlin/src/lcd/extensible_ui/ui_api.cpp
Unescape Escape View File

@ -708,7 +708,7 @@ namespace ExtUI {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
&& (linked_nozzles || active_extruder == 0) && (linked_nozzles || active_extruder == 0)
#endif #endif
) zprobe_zoffset += mm; ) zprobe_offset[Z_AXIS] += mm;
#else #else
UNUSED(mm); UNUSED(mm);
#endif #endif
@ -746,7 +746,7 @@ namespace ExtUI {
float getZOffset_mm() { float getZOffset_mm() {
#if HAS_BED_PROBE #if HAS_BED_PROBE
return zprobe_zoffset; return zprobe_offset[Z_AXIS];
#elif ENABLED(BABYSTEP_DISPLAY_TOTAL) #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
return babystep.axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1]; return babystep.axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];
#else #else
@ -757,7 +757,7 @@ namespace ExtUI {
void setZOffset_mm(const float value) { void setZOffset_mm(const float value) {
#if HAS_BED_PROBE #if HAS_BED_PROBE
if (WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX)) if (WITHIN(value, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX))
zprobe_zoffset = value; zprobe_offset[Z_AXIS] = value;
#elif ENABLED(BABYSTEP_DISPLAY_TOTAL) #elif ENABLED(BABYSTEP_DISPLAY_TOTAL)
babystep.add_mm(Z_AXIS, (value - babystep.axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1])); babystep.add_mm(Z_AXIS, (value - babystep.axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1]));
#else #else

8
Marlin/src/lcd/menu/menu.cpp
Unescape Escape View File

@ -402,7 +402,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
ui.encoderPosition = 0; ui.encoderPosition = 0;
const float diff = planner.steps_to_mm[Z_AXIS] * babystep_increment, const float diff = planner.steps_to_mm[Z_AXIS] * babystep_increment,
new_probe_offset = zprobe_zoffset + diff, new_probe_offset = zprobe_offset[Z_AXIS] + diff,
new_offs = new_offs =
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET) #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
do_probe ? new_probe_offset : hotend_offset[Z_AXIS][active_extruder] - diff do_probe ? new_probe_offset : hotend_offset[Z_AXIS][active_extruder] - diff
@ -414,7 +414,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
babystep.add_steps(Z_AXIS, babystep_increment); babystep.add_steps(Z_AXIS, babystep_increment);
if (do_probe) zprobe_zoffset = new_offs; if (do_probe) zprobe_offset[Z_AXIS] = new_offs;
#if ENABLED(BABYSTEP_HOTEND_Z_OFFSET) #if ENABLED(BABYSTEP_HOTEND_Z_OFFSET)
else hotend_offset[Z_AXIS][active_extruder] = new_offs; else hotend_offset[Z_AXIS][active_extruder] = new_offs;
#endif #endif
@ -428,10 +428,10 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
draw_edit_screen(PSTR(MSG_Z_OFFSET), ftostr43sign(hotend_offset[Z_AXIS][active_extruder])); draw_edit_screen(PSTR(MSG_Z_OFFSET), ftostr43sign(hotend_offset[Z_AXIS][active_extruder]));
else else
#endif #endif
draw_edit_screen(PSTR(MSG_ZPROBE_ZOFFSET), ftostr43sign(zprobe_zoffset)); draw_edit_screen(PSTR(MSG_ZPROBE_ZOFFSET), ftostr43sign(zprobe_offset[Z_AXIS]));
#if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY) #if ENABLED(BABYSTEP_ZPROBE_GFX_OVERLAY)
if (do_probe) _lcd_zoffset_overlay_gfx(zprobe_zoffset); if (do_probe) _lcd_zoffset_overlay_gfx(zprobe_offset[Z_AXIS]);
#endif #endif
} }
} }

4
Marlin/src/lcd/menu/menu_bed_corners.cpp
Unescape Escape View File

@ -62,10 +62,10 @@ static inline void _lcd_goto_next_corner() {
current_position[Y_AXIS] = Y_MIN_BED + LEVEL_CORNERS_INSET; current_position[Y_AXIS] = Y_MIN_BED + LEVEL_CORNERS_INSET;
break; break;
case 1: case 1:
current_position[X_AXIS] = X_MAX_BED - LEVEL_CORNERS_INSET; current_position[X_AXIS] = X_MAX_BED - (LEVEL_CORNERS_INSET);
break; break;
case 2: case 2:
current_position[Y_AXIS] = Y_MAX_BED - LEVEL_CORNERS_INSET; current_position[Y_AXIS] = Y_MAX_BED - (LEVEL_CORNERS_INSET);
break; break;
case 3: case 3:
current_position[X_AXIS] = X_MIN_BED + LEVEL_CORNERS_INSET; current_position[X_AXIS] = X_MIN_BED + LEVEL_CORNERS_INSET;

2
Marlin/src/lcd/menu/menu_bed_leveling.cpp
Unescape Escape View File

@ -279,7 +279,7 @@ void menu_bed_leveling() {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE #elif HAS_BED_PROBE
MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_offset[Z_AXIS], Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif #endif
#if ENABLED(LEVEL_BED_CORNERS) #if ENABLED(LEVEL_BED_CORNERS)

2
Marlin/src/lcd/menu/menu_configuration.cpp
Unescape Escape View File

@ -347,7 +347,7 @@ void menu_configuration() {
#if ENABLED(BABYSTEP_ZPROBE_OFFSET) #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset); MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
#elif HAS_BED_PROBE #elif HAS_BED_PROBE
MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX); MENU_ITEM_EDIT(float52, MSG_ZPROBE_ZOFFSET, &zprobe_offset[Z_AXIS], Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX);
#endif #endif
const bool busy = printer_busy(); const bool busy = printer_busy();

39
Marlin/src/module/configuration_store.cpp
Unescape Escape View File

@ -37,7 +37,7 @@
*/ */
// Change EEPROM version if the structure changes // Change EEPROM version if the structure changes
#define EEPROM_VERSION "V69" #define EEPROM_VERSION "V70"
#define EEPROM_OFFSET 100 #define EEPROM_OFFSET 100
// Check the integrity of data offsets. // Check the integrity of data offsets.
@ -60,6 +60,8 @@
#include "../HAL/shared/persistent_store_api.h" #include "../HAL/shared/persistent_store_api.h"
#endif #endif
#include "probe.h"
#if HAS_LEVELING #if HAS_LEVELING
#include "../feature/bedlevel/bedlevel.h" #include "../feature/bedlevel/bedlevel.h"
#endif #endif
@ -78,10 +80,6 @@
#define EEPROM_NUM_SERVOS NUM_SERVO_PLUGS #define EEPROM_NUM_SERVOS NUM_SERVO_PLUGS
#endif #endif
#if HAS_BED_PROBE
#include "probe.h"
#endif
#include "../feature/fwretract.h" #include "../feature/fwretract.h"
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
@ -178,7 +176,7 @@ typedef struct SettingsDataStruct {
// HAS_BED_PROBE // HAS_BED_PROBE
// //
float zprobe_zoffset; float zprobe_offset[XYZ];
// //
// ABL_PLANAR // ABL_PLANAR
@ -615,12 +613,8 @@ void MarlinSettings::postprocess() {
// Probe Z Offset // Probe Z Offset
// //
{ {
_FIELD_TEST(zprobe_zoffset); _FIELD_TEST(zprobe_offset[Z_AXIS]);
EEPROM_WRITE(zprobe_offset);
#if !HAS_BED_PROBE
const float zprobe_zoffset = 0;
#endif
EEPROM_WRITE(zprobe_zoffset);
} }
// //
@ -1421,12 +1415,14 @@ void MarlinSettings::postprocess() {
// Probe Z Offset // Probe Z Offset
// //
{ {
_FIELD_TEST(zprobe_zoffset); _FIELD_TEST(zprobe_offset[Z_AXIS]);
#if !HAS_BED_PROBE #if HAS_BED_PROBE
float zprobe_zoffset; float (&zpo)[XYZ] = zprobe_offset;
#else
float zpo[XYZ];
#endif #endif
EEPROM_READ(zprobe_zoffset); EEPROM_READ(zpo);
} }
// //
@ -2321,7 +2317,12 @@ void MarlinSettings::reset() {
#endif #endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER; #ifndef NOZZLE_TO_PROBE_OFFSET
#define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#endif
constexpr float dpo[XYZ] = NOZZLE_TO_PROBE_OFFSET;
static_assert(COUNT(dpo) == 3, "NOZZLE_TO_PROBE_OFFSET must contain offsets for X, Y, and Z.");
LOOP_XYZ(a) zprobe_offset[a] = dpo[a];
#endif #endif
// //
@ -3070,7 +3071,9 @@ void MarlinSettings::reset() {
say_units(true); say_units(true);
} }
CONFIG_ECHO_START(); CONFIG_ECHO_START();
SERIAL_ECHOLNPAIR(" M851 Z", LINEAR_UNIT(zprobe_zoffset)); SERIAL_ECHOLNPAIR(" M851 X", LINEAR_UNIT(zprobe_offset[X_AXIS]),
" Y", LINEAR_UNIT(zprobe_offset[Y_AXIS]),
" Z", LINEAR_UNIT(zprobe_offset[Z_AXIS]));
#endif #endif
/** /**

2
Marlin/src/module/delta.cpp
Unescape Escape View File

@ -233,7 +233,7 @@ void home_delta() {
// Move all carriages together linearly until an endstop is hit. // Move all carriages together linearly until an endstop is hit.
destination[Z_AXIS] = (delta_height destination[Z_AXIS] = (delta_height
#if HAS_BED_PROBE #if HAS_BED_PROBE
- zprobe_zoffset - zprobe_offset[Z_AXIS]
#endif #endif
+ 10); + 10);
buffer_line_to_destination(homing_feedrate(X_AXIS)); buffer_line_to_destination(homing_feedrate(X_AXIS));

8
Marlin/src/module/motion.cpp
Unescape Escape View File

@ -505,7 +505,7 @@ void restore_feedrate_and_scaling() {
soft_endstop[axis].min = base_min_pos(axis); soft_endstop[axis].min = base_min_pos(axis);
soft_endstop[axis].max = (axis == Z_AXIS ? delta_height soft_endstop[axis].max = (axis == Z_AXIS ? delta_height
#if HAS_BED_PROBE #if HAS_BED_PROBE
- zprobe_zoffset - zprobe_offset[Z_AXIS]
#endif #endif
: base_max_pos(axis)); : base_max_pos(axis));
@ -1340,7 +1340,7 @@ void set_axis_is_at_home(const AxisEnum axis) {
#elif ENABLED(DELTA) #elif ENABLED(DELTA)
current_position[axis] = (axis == Z_AXIS ? delta_height current_position[axis] = (axis == Z_AXIS ? delta_height
#if HAS_BED_PROBE #if HAS_BED_PROBE
- zprobe_zoffset - zprobe_offset[Z_AXIS]
#endif #endif
: base_home_pos(axis)); : base_home_pos(axis));
#else #else
@ -1354,9 +1354,9 @@ void set_axis_is_at_home(const AxisEnum axis) {
if (axis == Z_AXIS) { if (axis == Z_AXIS) {
#if HOMING_Z_WITH_PROBE #if HOMING_Z_WITH_PROBE
current_position[Z_AXIS] -= zprobe_zoffset; current_position[Z_AXIS] -= zprobe_offset[Z_AXIS];
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> zprobe_zoffset = ", zprobe_zoffset); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("*** Z HOMED WITH PROBE (Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN) ***\n> zprobe_offset[Z_AXIS] = ", zprobe_offset[Z_AXIS]);
#else #else

16
Marlin/src/module/motion.h
Unescape Escape View File

@ -30,14 +30,14 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if IS_SCARA
#include "scara.h"
#endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
#include "probe.h" #include "probe.h"
#endif #endif
#if IS_SCARA
#include "scara.h"
#endif
// Axis homed and known-position states // Axis homed and known-position states
extern uint8_t axis_homed, axis_known_position; extern uint8_t axis_homed, axis_known_position;
constexpr uint8_t xyz_bits = _BV(X_AXIS) | _BV(Y_AXIS) | _BV(Z_AXIS); constexpr uint8_t xyz_bits = _BV(X_AXIS) | _BV(Y_AXIS) | _BV(Z_AXIS);
@ -284,7 +284,7 @@ void homeaxis(const AxisEnum axis);
// Return true if the both nozzle and the probe can reach the given point. // Return true if the both nozzle and the probe can reach the given point.
// Note: This won't work on SCARA since the probe offset rotates with the arm. // Note: This won't work on SCARA since the probe offset rotates with the arm.
inline bool position_is_reachable_by_probe(const float &rx, const float &ry) { inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
return position_is_reachable(rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ry - (Y_PROBE_OFFSET_FROM_EXTRUDER)) return position_is_reachable(rx - zprobe_offset[X_AXIS], ry - zprobe_offset[Y_AXIS])
&& position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE)); && position_is_reachable(rx, ry, ABS(MIN_PROBE_EDGE));
} }
#endif #endif
@ -313,9 +313,9 @@ void homeaxis(const AxisEnum axis);
* nozzle must be be able to reach +10,-10. * nozzle must be be able to reach +10,-10.
*/ */
inline bool position_is_reachable_by_probe(const float &rx, const float &ry) { inline bool position_is_reachable_by_probe(const float &rx, const float &ry) {
return position_is_reachable(rx - (X_PROBE_OFFSET_FROM_EXTRUDER), ry - (Y_PROBE_OFFSET_FROM_EXTRUDER)) return position_is_reachable(rx - zprobe_offset[X_AXIS], ry - zprobe_offset[Y_AXIS])
&& WITHIN(rx, MIN_PROBE_X - slop, MAX_PROBE_X + slop) && WITHIN(rx, probe_min_x() - slop, probe_max_x() + slop)
&& WITHIN(ry, MIN_PROBE_Y - slop, MAX_PROBE_Y + slop); && WITHIN(ry, probe_min_y() - slop, probe_max_y() + slop);
} }
#endif #endif

51
Marlin/src/module/probe.cpp
Unescape Escape View File

@ -56,7 +56,7 @@
#include "../feature/backlash.h" #include "../feature/backlash.h"
#endif #endif
float zprobe_zoffset; // Initialized by settings.load() float zprobe_offset[XYZ]; // Initialized by settings.load()
#if ENABLED(BLTOUCH) #if ENABLED(BLTOUCH)
#include "../feature/bltouch.h" #include "../feature/bltouch.h"
@ -86,6 +86,43 @@ float zprobe_zoffset; // Initialized by settings.load()
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE) #define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../core/debug_out.h" #include "../core/debug_out.h"
float probe_min_x() {
return _MAX(
#if ENABLED(DELTA) || IS_SCARA
PROBE_X_MIN, MESH_MIN_X
#else
(X_MIN_BED) + (MIN_PROBE_EDGE), (X_MIN_POS) + zprobe_offset[X_AXIS]
#endif
);
}
float probe_max_x() {
return _MIN(
#if ENABLED(DELTA) || IS_SCARA
PROBE_X_MAX, MESH_MAX_X
#else
(X_MAX_BED) - (MIN_PROBE_EDGE), (X_MAX_POS) + zprobe_offset[X_AXIS]
#endif
);
}
float probe_min_y() {
return _MAX(
#if ENABLED(DELTA) || IS_SCARA
PROBE_Y_MIN, MESH_MIN_Y
#else
(Y_MIN_BED) + (MIN_PROBE_EDGE), (Y_MIN_POS) + zprobe_offset[Y_AXIS]
#endif
);
}
float probe_max_y() {
return _MIN(
#if ENABLED(DELTA) || IS_SCARA
PROBE_Y_MAX, MESH_MAX_Y
#else
(Y_MAX_BED) - (MIN_PROBE_EDGE), (Y_MAX_POS) + zprobe_offset[Y_AXIS]
#endif
);
}
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#ifndef SLED_DOCKING_OFFSET #ifndef SLED_DOCKING_OFFSET
@ -263,7 +300,7 @@ inline void do_probe_raise(const float z_raise) {
if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("do_probe_raise(", z_raise, ")"); if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPAIR("do_probe_raise(", z_raise, ")");
float z_dest = z_raise; float z_dest = z_raise;
if (zprobe_zoffset < 0) z_dest -= zprobe_zoffset; if (zprobe_offset[Z_AXIS] < 0) z_dest -= zprobe_offset[Z_AXIS];
NOMORE(z_dest, Z_MAX_POS); NOMORE(z_dest, Z_MAX_POS);
@ -543,7 +580,7 @@ static float run_z_probe() {
// Stop the probe before it goes too low to prevent damage. // Stop the probe before it goes too low to prevent damage.
// If Z isn't known then probe to -10mm. // If Z isn't known then probe to -10mm.
const float z_probe_low_point = TEST(axis_known_position, Z_AXIS) ? -zprobe_zoffset + Z_PROBE_LOW_POINT : -10.0; const float z_probe_low_point = TEST(axis_known_position, Z_AXIS) ? -zprobe_offset[Z_AXIS] + Z_PROBE_LOW_POINT : -10.0;
// Double-probing does a fast probe followed by a slow probe // Double-probing does a fast probe followed by a slow probe
#if TOTAL_PROBING == 2 #if TOTAL_PROBING == 2
@ -568,7 +605,7 @@ static float run_z_probe() {
// If the nozzle is well over the travel height then // If the nozzle is well over the travel height then
// move down quickly before doing the slow probe // move down quickly before doing the slow probe
const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (zprobe_zoffset < 0 ? -zprobe_zoffset : 0); const float z = Z_CLEARANCE_DEPLOY_PROBE + 5.0 + (zprobe_offset[Z_AXIS] < 0 ? -zprobe_offset[Z_AXIS] : 0);
if (current_position[Z_AXIS] > z) { if (current_position[Z_AXIS] > z) {
// Probe down fast. If the probe never triggered, raise for probe clearance // Probe down fast. If the probe never triggered, raise for probe clearance
if (!do_probe_move(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST))) if (!do_probe_move(z, MMM_TO_MMS(Z_PROBE_SPEED_FAST)))
@ -698,8 +735,8 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
float nx = rx, ny = ry; float nx = rx, ny = ry;
if (probe_relative) { if (probe_relative) {
if (!position_is_reachable_by_probe(rx, ry)) return NAN; // The given position is in terms of the probe if (!position_is_reachable_by_probe(rx, ry)) return NAN; // The given position is in terms of the probe
nx -= (X_PROBE_OFFSET_FROM_EXTRUDER); // Get the nozzle position nx -= zprobe_offset[X_AXIS]; // Get the nozzle position
ny -= (Y_PROBE_OFFSET_FROM_EXTRUDER); ny -= zprobe_offset[Y_AXIS];
} }
else if (!position_is_reachable(nx, ny)) return NAN; // The given position is in terms of the nozzle else if (!position_is_reachable(nx, ny)) return NAN; // The given position is in terms of the nozzle
@ -720,7 +757,7 @@ float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_
float measured_z = NAN; float measured_z = NAN;
if (!DEPLOY_PROBE()) { if (!DEPLOY_PROBE()) {
measured_z = run_z_probe() + zprobe_zoffset; measured_z = run_z_probe() + zprobe_offset[Z_AXIS];
const bool big_raise = raise_after == PROBE_PT_BIG_RAISE; const bool big_raise = raise_after == PROBE_PT_BIG_RAISE;
if (big_raise || raise_after == PROBE_PT_RAISE) if (big_raise || raise_after == PROBE_PT_RAISE)

9
Marlin/src/module/probe.h
Unescape Escape View File

@ -28,7 +28,8 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#if HAS_BED_PROBE #if HAS_BED_PROBE
extern float zprobe_zoffset;
extern float zprobe_offset[XYZ];
bool set_probe_deployed(const bool deploy); bool set_probe_deployed(const bool deploy);
#ifdef Z_AFTER_PROBING #ifdef Z_AFTER_PROBING
void move_z_after_probing(); void move_z_after_probing();
@ -45,9 +46,15 @@
#if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER) #if HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER)
extern const char msg_wait_for_bed_heating[25]; extern const char msg_wait_for_bed_heating[25];
#endif #endif
float probe_min_x(), probe_max_x(), probe_min_y(), probe_max_y();
#else #else
constexpr float zprobe_offset[XYZ] = { 0 };
#define DEPLOY_PROBE() #define DEPLOY_PROBE()
#define STOW_PROBE() #define STOW_PROBE()
#endif #endif
#if HAS_Z_SERVO_PROBE #if HAS_Z_SERVO_PROBE

19
config/default/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/3DFabXYZ/Migbot/Configuration.h
Unescape Escape View File

@ -894,11 +894,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -910,10 +909,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 21 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 21, 61, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 61 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -947,7 +946,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1205,12 +1204,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y 4 #define GRID_MAX_POINTS_Y 4
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION X_PROBE_OFFSET_FROM_EXTRUDER
#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (X_PROBE_OFFSET_FROM_EXTRUDER) + MIN_PROBE_EDGE)
#define FRONT_PROBE_BED_POSITION Y_PROBE_OFFSET_FROM_EXTRUDER
#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/ADIMLab/Gantry v1/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1200,12 +1199,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/ADIMLab/Gantry v2/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1200,12 +1199,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/AlephObjects/TAZ4/Configuration.h
Unescape Escape View File

@ -908,11 +908,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -924,10 +923,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -961,7 +960,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1219,12 +1218,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

21
config/examples/Alfawise/U20-bltouch/Configuration.h
Unescape Escape View File

@ -953,11 +953,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -969,10 +968,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -35 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -35, -6, -0.5 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -6 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -0.5 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -1006,7 +1005,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1278,12 +1277,6 @@
#define GRID_MAX_POINTS_X 4 #define GRID_MAX_POINTS_X 4
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST
@ -1404,7 +1397,7 @@
#if ENABLED(Z_SAFE_HOMING) #if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
//#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). //#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_Y_POINT MIN_PROBE_Y #define Z_SAFE_HOMING_Y_POINT 4
#endif #endif
// Homing speeds (mm/m) // Homing speeds (mm/m)

21
config/examples/Alfawise/U20/Configuration.h
Unescape Escape View File

@ -953,11 +953,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -969,10 +968,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -1006,7 +1005,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1278,12 +1277,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST
@ -1403,7 +1396,7 @@
#if ENABLED(Z_SAFE_HOMING) #if ENABLED(Z_SAFE_HOMING)
#define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28). #define Z_SAFE_HOMING_X_POINT ((X_BED_SIZE) / 2) // X point for Z homing when homing all axes (G28).
#define Z_SAFE_HOMING_Y_POINT ((Y_BED_SIZE) / 2) // Y point for Z homing when homing all axes (G28). #define Z_SAFE_HOMING_Y_POINT 4 // Y point for Z homing when homing all axes (G28).
#endif #endif
// Homing speeds (mm/m) // Homing speeds (mm/m)

19
config/examples/AliExpress/CL-260/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/AliExpress/UM2pExt/Configuration.h
Unescape Escape View File

@ -899,11 +899,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -915,10 +914,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -952,7 +951,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1210,12 +1209,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Anet/A2/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
//#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
//#define MIN_PROBE_EDGE 10 //#define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Anet/A2plus/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
//#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
//#define MIN_PROBE_EDGE 10 //#define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

59
config/examples/Anet/A6/Configuration.h
Unescape Escape View File

@ -935,11 +935,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -951,31 +950,23 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
//#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// ANET A8: FRONT-MOUNTED SENSOR WITH 3D PRINTED MOUNT // ANET A8: FRONT-MOUNTED SENSOR WITH 3D PRINTED MOUNT
//#define X_PROBE_OFFSET_FROM_EXTRUDER -28 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { -28, -45, 0 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER -45 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// THESE ARE FOR THE OFFICIAL ANET REAR-MOUNTED SENSOR // THESE ARE FOR THE OFFICIAL ANET REAR-MOUNTED SENSOR
//#define X_PROBE_OFFSET_FROM_EXTRUDER -1 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { -1, 3, 0 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER 3 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// ANET A6 with BLTouch/3D-Touch mounted right to the nozzle // ANET A6 with BLTouch/3D-Touch mounted right to the nozzle
#define X_PROBE_OFFSET_FROM_EXTRUDER 39 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 39, 0, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
//ANET A6 with BLTouch/3D-Touch betwen Fan and Belt //ANET A6 with BLTouch/3D-Touch betwen Fan and Belt
// (mount: https://github.com/ralf-e/ANET_A6_modifications/tree/master/A6_X-Axis) // (mount: https://github.com/ralf-e/ANET_A6_modifications/tree/master/A6_X-Axis)
//#define X_PROBE_OFFSET_FROM_EXTRUDER -30 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { -30, 15, 0.75 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.75 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -1010,7 +1001,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1312,36 +1303,6 @@
#define GRID_MAX_POINTS_X 4 #define GRID_MAX_POINTS_X 4
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 15
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - 15)
//#define FRONT_PROBE_BED_POSITION 15
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - 15)
// ANET A6
//#define LEFT_PROBE_BED_POSITION 20
//#define RIGHT_PROBE_BED_POSITION 190
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 190
// ANET A6 BLTOUCH right (39mm) to the nozzle
//#define LEFT_PROBE_BED_POSITION 36
//#define RIGHT_PROBE_BED_POSITION 190
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 190
// ANET A6 with new X-Axis and modded Y-Axis
//#define LEFT_PROBE_BED_POSITION 20
//#define RIGHT_PROBE_BED_POSITION 205
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 205
// ANET A6 with new X-Axis and modded Y-Axis, X0/Y0 front left bed edge
//#define LEFT_PROBE_BED_POSITION 20
//#define RIGHT_PROBE_BED_POSITION 194
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 194
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Anet/A8/Configuration.h
Unescape Escape View File

@ -901,11 +901,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -917,10 +916,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -954,7 +953,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1212,12 +1211,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Anet/A8plus/Configuration.h
Unescape Escape View File

@ -899,11 +899,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -915,10 +914,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -952,7 +951,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1210,12 +1209,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Anet/E16/Configuration.h
Unescape Escape View File

@ -900,11 +900,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -916,10 +915,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -953,7 +952,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1211,12 +1210,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/AnyCubic/i3/Configuration.h
Unescape Escape View File

@ -898,11 +898,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -914,10 +913,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 75 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 75, 5, -2 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 5 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -2 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -951,7 +950,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1209,12 +1208,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/ArmEd/Configuration.h
Unescape Escape View File

@ -889,11 +889,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -905,10 +904,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -942,7 +941,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1200,12 +1199,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Azteeg/X5GT/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/BIBO/TouchX/cyclops/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 15
//#define RIGHT_PROBE_BED_POSITION 170
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/BIBO/TouchX/default/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 15
//#define RIGHT_PROBE_BED_POSITION 170
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/BQ/Hephestos/Configuration.h
Unescape Escape View File

@ -876,11 +876,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -892,10 +891,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -929,7 +928,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1187,12 +1186,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/BQ/Hephestos_2/Configuration.h
Unescape Escape View File

@ -889,11 +889,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -905,10 +904,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 34 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 34, 15, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -942,7 +941,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION X_MIN_POS + (X_PROBE_OFFSET_FROM_EXTRUDER)
//#define RIGHT_PROBE_BED_POSITION X_MAX_POS - (X_PROBE_OFFSET_FROM_EXTRUDER)
//#define FRONT_PROBE_BED_POSITION Y_MIN_POS + (Y_PROBE_OFFSET_FROM_EXTRUDER)
//#define BACK_PROBE_BED_POSITION Y_MAX_POS - (Y_PROBE_OFFSET_FROM_EXTRUDER)
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/BQ/WITBOX/Configuration.h
Unescape Escape View File

@ -876,11 +876,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -892,10 +891,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -929,7 +928,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1187,12 +1186,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Cartesio/Configuration.h
Unescape Escape View File

@ -887,11 +887,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -903,10 +902,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -940,7 +939,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1198,12 +1197,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-10/Configuration.h
Unescape Escape View File

@ -898,11 +898,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -914,10 +913,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -951,7 +950,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1209,12 +1208,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-10S/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1200,12 +1199,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-10_5S/Configuration.h
Unescape Escape View File

@ -889,11 +889,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -905,10 +904,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -942,7 +941,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1202,12 +1201,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-10mini/Configuration.h
Unescape Escape View File

@ -907,11 +907,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -923,10 +922,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -960,7 +959,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1218,12 +1217,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-20 Pro/Configuration.h
Unescape Escape View File

@ -891,11 +891,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -907,10 +906,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -944,7 +943,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1202,12 +1201,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-20/Configuration.h
Unescape Escape View File

@ -891,11 +891,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -907,10 +906,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -944,7 +943,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1202,12 +1201,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/CR-8/Configuration.h
Unescape Escape View File

@ -898,11 +898,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -914,10 +913,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -951,7 +950,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1209,12 +1208,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/Ender-2/Configuration.h
Unescape Escape View File

@ -892,11 +892,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -908,10 +907,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -945,7 +944,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1203,12 +1202,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/Ender-3/Configuration.h
Unescape Escape View File

@ -892,11 +892,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -908,10 +907,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -945,7 +944,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1203,12 +1202,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/Ender-4/Configuration.h
Unescape Escape View File

@ -898,11 +898,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -914,10 +913,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -951,7 +950,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1209,12 +1208,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Creality/Ender-5/Configuration.h
Unescape Escape View File

@ -891,11 +891,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -907,10 +906,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -944,7 +943,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1202,12 +1201,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Dagoma/Disco Ultimate/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 0, 21, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 21 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h
Unescape Escape View File

@ -893,11 +893,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -909,10 +908,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -946,7 +945,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1204,12 +1203,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Einstart-S/Configuration.h
Unescape Escape View File

@ -898,11 +898,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -914,10 +913,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -951,7 +950,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1209,12 +1208,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FYSETC/AIO_II/Configuration.h
Unescape Escape View File

@ -893,11 +893,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -909,10 +908,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -946,7 +945,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1204,12 +1203,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration.h
Unescape Escape View File

@ -893,11 +893,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -909,10 +908,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -44 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -44, -6, -3.9 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -6 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.9 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -946,7 +945,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1204,12 +1203,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FYSETC/Cheetah 1.2/base/Configuration.h
Unescape Escape View File

@ -893,11 +893,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -909,10 +908,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -946,7 +945,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1204,12 +1203,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FYSETC/Cheetah/BLTouch/Configuration.h
Unescape Escape View File

@ -893,11 +893,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -909,10 +908,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -44 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -44, -6, -3.9 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -6 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.9 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -946,7 +945,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1204,12 +1203,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FYSETC/Cheetah/base/Configuration.h
Unescape Escape View File

@ -893,11 +893,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -909,10 +908,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -946,7 +945,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1204,12 +1203,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FYSETC/F6_13/Configuration.h
Unescape Escape View File

@ -890,11 +890,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -906,10 +905,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -943,7 +942,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1201,12 +1200,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Felix/Configuration.h
Unescape Escape View File

@ -870,11 +870,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -886,10 +885,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -923,7 +922,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1181,12 +1180,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Felix/DUAL/Configuration.h
Unescape Escape View File

@ -870,11 +870,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -886,10 +885,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -25 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -923,7 +922,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1181,12 +1180,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FlashForge/CreatorPro/Configuration.h
Unescape Escape View File

@ -880,11 +880,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -896,10 +895,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -933,7 +932,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1192,12 +1191,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/FolgerTech/i3-2020/Configuration.h
Unescape Escape View File

@ -894,11 +894,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -910,10 +909,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 38 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 38, -7, -10.75 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -7 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -10.75 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 0 #define MIN_PROBE_EDGE 0
@ -947,7 +946,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1205,12 +1204,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Formbot/Raptor/Configuration.h
Unescape Escape View File

@ -971,11 +971,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -987,10 +986,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -22 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -22, 0, -1.5 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -1.5 // Z offset: -below +above [the nozzle]
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
// X and Y axis travel speed (mm/m) between probes // X and Y axis travel speed (mm/m) between probes
@ -1022,7 +1021,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1301,12 +1300,6 @@
#define GRID_MAX_POINTS_X 6 #define GRID_MAX_POINTS_X 6
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
#define LEFT_PROBE_BED_POSITION 30
#define RIGHT_PROBE_BED_POSITION 365
#define FRONT_PROBE_BED_POSITION 30
#define BACK_PROBE_BED_POSITION 365
// The Z probe minimum outer margin (to validate G29 parameters). // The Z probe minimum outer margin (to validate G29 parameters).
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10

19
config/examples/Formbot/T_Rex_2+/Configuration.h
Unescape Escape View File

@ -917,11 +917,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -933,10 +932,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -3 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -3, 31, -1.25 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 31 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -1.25 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 0 #define MIN_PROBE_EDGE 0
@ -970,7 +969,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1228,12 +1227,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Formbot/T_Rex_3/Configuration.h
Unescape Escape View File

@ -904,11 +904,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -920,10 +919,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -3 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -3, 31, -1.25 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 31 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -1.25 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 0 #define MIN_PROBE_EDGE 0
@ -957,7 +956,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1224,12 +1223,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - MIN_PROBE_EDGE)
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - MIN_PROBE_EDGE)
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/A10/Configuration.h
Unescape Escape View File

@ -871,11 +871,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -887,10 +886,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -37 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -37, 0, -3.6 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.6 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -924,7 +923,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1184,12 +1183,6 @@
#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/A10M/Configuration.h
Unescape Escape View File

@ -871,11 +871,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -887,10 +886,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -37 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -37, 0, -3.6 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.6 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -924,7 +923,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1184,12 +1183,6 @@
#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/A20M/Configuration.h
Unescape Escape View File

@ -871,11 +871,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -887,10 +886,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -37 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -37, 0, -3.6 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.6 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -924,7 +923,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1184,12 +1183,6 @@
#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/GT2560/Configuration.h
Unescape Escape View File

@ -903,11 +903,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -919,10 +918,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -956,7 +955,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1214,12 +1213,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 8 #define MIN_PROBE_EDGE 8
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/MeCreator2/Configuration.h
Unescape Escape View File

@ -895,11 +895,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -911,10 +910,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -948,7 +947,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1206,12 +1205,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
Unescape Escape View File

@ -909,11 +909,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -925,10 +924,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 4 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 4, -44, -1.4 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER -44 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -1.4 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -962,7 +961,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1220,12 +1219,6 @@
#define GRID_MAX_POINTS_X 4 #define GRID_MAX_POINTS_X 4
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 10
//#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
//#define FRONT_PROBE_BED_POSITION 15
//#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
Unescape Escape View File

@ -908,11 +908,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -924,10 +923,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -961,7 +960,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1219,12 +1218,6 @@
#define GRID_MAX_POINTS_X 4 #define GRID_MAX_POINTS_X 4
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 10
//#define RIGHT_PROBE_BED_POSITION (X_MAX_POS - X_PROBE_OFFSET_FROM_EXTRUDER - 14)
//#define FRONT_PROBE_BED_POSITION 15
//#define BACK_PROBE_BED_POSITION (Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER - 25)
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
Unescape Escape View File

@ -888,11 +888,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -904,10 +903,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -941,7 +940,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1199,12 +1198,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/HMS434/Configuration.h
Unescape Escape View File

@ -875,11 +875,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -891,10 +890,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER -21 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { -21, 22, -1.54 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 22 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER -1.54 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 20 #define MIN_PROBE_EDGE 20
@ -928,7 +927,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1186,12 +1185,6 @@
#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y 3 #define GRID_MAX_POINTS_Y 3
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Infitary/i3-M508/Configuration.h
Unescape Escape View File

@ -892,11 +892,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -908,10 +907,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -945,7 +944,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1203,12 +1202,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/JGAurora/A1/Configuration.h
Unescape Escape View File

@ -895,11 +895,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -911,10 +910,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -948,7 +947,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1206,12 +1205,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/JGAurora/A5/Configuration.h
Unescape Escape View File

@ -900,11 +900,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -916,10 +915,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -953,7 +952,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1211,12 +1210,6 @@
#define GRID_MAX_POINTS_X 5 #define GRID_MAX_POINTS_X 5
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 15
//#define RIGHT_PROBE_BED_POSITION 170
//#define FRONT_PROBE_BED_POSITION 20
//#define BACK_PROBE_BED_POSITION 170
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/JGAurora/A5S/Configuration.h
Unescape Escape View File

@ -895,11 +895,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -911,10 +910,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -948,7 +947,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1206,12 +1205,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/MakerParts/Configuration.h
Unescape Escape View File

@ -908,11 +908,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -924,10 +923,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -961,7 +960,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1219,12 +1218,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Malyan/M150/Configuration.h
Unescape Escape View File

@ -908,11 +908,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -924,14 +923,14 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
// Set for HoolyHoo's probe mount // Set for HoolyHoo's probe mount
// http://www.thingiverse.com/thing:1960419 // http://www.thingiverse.com/thing:1960419
// Note: HoolyHoo mount is X=35, Y=-50. // Note: HoolyHoo mount is X=35, Y=-50.
//#define X_PROBE_OFFSET_FROM_EXTRUDER 35 // X offset: -left +right [of the nozzle] //#define NOZZLE_TO_PROBE_OFFSET { 35, -50, 0 }
//#define Y_PROBE_OFFSET_FROM_EXTRUDER -50 // Y offset: -front +behind [the nozzle]
//#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -965,7 +964,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1227,12 +1226,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION 50
//#define RIGHT_PROBE_BED_POSITION 150
//#define FRONT_PROBE_BED_POSITION 50
//#define BACK_PROBE_BED_POSITION 150
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Malyan/M200/Configuration.h
Unescape Escape View File

@ -887,11 +887,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -903,10 +902,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -940,7 +939,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1198,12 +1197,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Micromake/C1/basic/Configuration.h
Unescape Escape View File

@ -892,11 +892,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -908,10 +907,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -945,7 +944,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1203,12 +1202,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Micromake/C1/enhanced/Configuration.h
Unescape Escape View File

@ -892,11 +892,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -908,10 +907,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 0 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 0, 0, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -945,7 +944,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1203,12 +1202,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

19
config/examples/Mks/Robin/Configuration.h
Unescape Escape View File

@ -889,11 +889,10 @@
/** /**
* Z Probe to nozzle (X,Y) offset, relative to (0, 0). * Z Probe to nozzle (X,Y) offset, relative to (0, 0).
* X and Y offsets must be integers.
* *
* In the following example the X and Y offsets are both positive: * In the following example the X and Y offsets are both positive:
* #define X_PROBE_OFFSET_FROM_EXTRUDER 10 *
* #define Y_PROBE_OFFSET_FROM_EXTRUDER 10 * #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
* *
* +-- BACK ---+ * +-- BACK ---+
* | | * | |
@ -905,10 +904,10 @@
* | | * | |
* O-- FRONT --+ * O-- FRONT --+
* (0,0) * (0,0)
*
* Specify a Probe position as { X, Y, Z }
*/ */
#define X_PROBE_OFFSET_FROM_EXTRUDER 10 // X offset: -left +right [of the nozzle] #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -942,7 +941,7 @@
* *
* Use these settings to specify the distance (mm) to raise the probe (or * Use these settings to specify the distance (mm) to raise the probe (or
* lower the bed). The values set here apply over and above any (negative) * lower the bed). The values set here apply over and above any (negative)
* probe Z Offset set with Z_PROBE_OFFSET_FROM_EXTRUDER, M851, or the LCD. * probe Z Offset set with NOZZLE_TO_PROBE_OFFSET, M851, or the LCD.
* Only integer values >= 1 are valid here. * Only integer values >= 1 are valid here.
* *
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
@ -1200,12 +1199,6 @@
#define GRID_MAX_POINTS_X 3 #define GRID_MAX_POINTS_X 3
#define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X
// Set the boundaries for probing (where the probe can reach).
//#define LEFT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define RIGHT_PROBE_BED_POSITION (X_BED_SIZE - (MIN_PROBE_EDGE))
//#define FRONT_PROBE_BED_POSITION MIN_PROBE_EDGE
//#define BACK_PROBE_BED_POSITION (Y_BED_SIZE - (MIN_PROBE_EDGE))
// Probe along the Y axis, advancing X after each column // Probe along the Y axis, advancing X after each column
//#define PROBE_Y_FIRST //#define PROBE_Y_FIRST

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save