MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

'G29 H' to set a centered square probe area (linear, bilinear) (#12242)

Browse Source
This commit is contained in:
MasterPIC 2018-10-28 02:30:21 +01:00 committed by Scott Lahteine
parent c1e8bd6add
commit 6fbc87301f
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/src/gcode/bedlevel/abl/G29.cpp
View File

@ -103,6 +103,10 @@
* *
* S Set the XY travel speed between probe points (in units/min) * S Set the XY travel speed between probe points (in units/min)
* *
* H Set bounds to a centered square H x H units in size
*
* -or-
*
* F Set the Front limit of the probing grid * F Set the Front limit of the probing grid
* B Set the Back limit of the probing grid * B Set the Back limit of the probing grid
* L Set the Left limit of the probing grid * L Set the Left limit of the probing grid
@ -381,10 +385,19 @@ G29_TYPE GcodeSuite::G29() {
xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_SPEED)); xy_probe_feedrate_mm_s = MMM_TO_MMS(parser.linearval('S', XY_PROBE_SPEED));
left_probe_bed_position = parser.seenval('L') ? (int)RAW_X_POSITION(parser.value_linear_units()) : LEFT_PROBE_BED_POSITION; if (parser.seen('H')) {
right_probe_bed_position = parser.seenval('R') ? (int)RAW_X_POSITION(parser.value_linear_units()) : RIGHT_PROBE_BED_POSITION; const int16_t size = (int16_t)parser.value_linear_units();
front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION; left_probe_bed_position = MAX((MIN_PROBE_X + MAX_PROBE_X - size) / 2, MIN_PROBE_X);
back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION; right_probe_bed_position = MIN(left_probe_bed_position + size, MAX_PROBE_X);
front_probe_bed_position = MAX((MIN_PROBE_Y + MAX_PROBE_Y - size) / 2, MIN_PROBE_Y);
back_probe_bed_position = MIN(front_probe_bed_position + size, MAX_PROBE_Y);
}
else {
left_probe_bed_position = parser.seenval('L') ? (int)RAW_X_POSITION(parser.value_linear_units()) : LEFT_PROBE_BED_POSITION;
right_probe_bed_position = parser.seenval('R') ? (int)RAW_X_POSITION(parser.value_linear_units()) : RIGHT_PROBE_BED_POSITION;
front_probe_bed_position = parser.seenval('F') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : FRONT_PROBE_BED_POSITION;
back_probe_bed_position = parser.seenval('B') ? (int)RAW_Y_POSITION(parser.value_linear_units()) : BACK_PROBE_BED_POSITION;
}
if ( if (
#if IS_SCARA || ENABLED(DELTA) #if IS_SCARA || ENABLED(DELTA)

2
Marlin/src/module/probe.cpp
View File

@ -401,7 +401,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
deploy ? run_deploy_moves_script() : run_stow_moves_script(); deploy ? run_deploy_moves_script() : run_stow_moves_script();
#elif ENABLED(RACK_AND_PINION_PROBE) #elif ENABLED(RACK_AND_PINION_PROBE)
do_blocking_move_to_x(deploy ? Z_PROBE_DEPLOY_X : Z_PROBE_RETRACT_X); do_blocking_move_to_x(deploy ? Z_PROBE_DEPLOY_X : Z_PROBE_RETRACT_X);
#endif #endif