CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '17-add-m48-message-about-movement' into 'master'

Browse Source 
Resolve "Add M48 Message about movement"

Closes #17

See merge request lulzbot3d/marlin!17
This commit is contained in:
Dawson Coleman 2021-09-17 14:35:01 +00:00
commit ef77725a06
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Marlin/src/gcode/calibrate/M48.cpp
View File

@ -73,15 +73,30 @@ void GcodeSuite::M48() {
const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE; const ProbePtRaise raise_after = parser.boolval('E') ? PROBE_PT_STOW : PROBE_PT_RAISE;
constexpr xy_pos_t probe_point = PROBE_SAFE_POINT; constexpr xy_pos_t safe_point = PROBE_SAFE_POINT;
do_blocking_move_to_xy(probe_point); //moving toolhead to a safe probing point
// Test at the current position by default, overridden by X and Y // Test at PROBE_SAFE_POINT by default, overridden by X and Y
const xy_pos_t test_position = { // If either X or Y is specified, the current position will be used for the
parser.linearval('X', current_position.x + probe.offset_xy.x), // If no X use the probe's current X position // other coordinate.
parser.linearval('Y', current_position.y + probe.offset_xy.y) // If no Y, ditto xy_pos_t test_position = {
parser.linearval('X', safe_point.x), // If no X use PROBE_SAFE_POINT
parser.linearval('Y', safe_point.y) // If no Y, ditto
}; };
if (test_position == safe_point) {
SERIAL_ECHOLNPGM("Moving to safe position for probe.");
} else {
// If a coordinate is equal to the safe point coordinate, it was not set by an argument.
// In the case of one coordinate being set, use the current position as the default for the unset coordinate instead of the safe point's coordinate.
if(test_position.x == safe_point.x) {
test_position.x = current_position.x + probe.offset_xy.x;
}
if(test_position.y == safe_point.y) {
test_position.y = current_position.y + probe.offset_xy.y;
}
}
if (!probe.can_reach(test_position)) { if (!probe.can_reach(test_position)) {
ui.set_status_P(GET_TEXT(MSG_M48_OUT_OF_BOUNDS), 99); ui.set_status_P(GET_TEXT(MSG_M48_OUT_OF_BOUNDS), 99);
SERIAL_ECHOLNPGM("? (X,Y) out of bounds."); SERIAL_ECHOLNPGM("? (X,Y) out of bounds.");