3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-13 03:12:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

misc. cleanup

Browse source
This commit is contained in:
Scott Lahteine 2024-05-20 00:35:42 -05:00
parent 86f1a00bdc
commit d789e46fd2
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Marlin/src/gcode/geometry/M206_M428.cpp
View file

@ -83,12 +83,16 @@ void GcodeSuite::M206_report(const bool forReplay/*=true*/) {
*/
void GcodeSuite::M428() {
if (homing_needed_error()) return;
const bool adding = parser.seen_test('P'),
no_axes = !parser.seen(STR_AXES_LOGICAL);
xyz_float_t diff;
LOOP_NUM_AXES(i) {
if (parser.seen_test(AXIS_CHAR(i))){
if (no_axes || parser.seen_test(AXIS_CHAR(i))) {
diff[i] = base_home_pos((AxisEnum)i) - current_position[i];
if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
diff[i] = -current_position[i] ;
// If the current position is too far, for min homing just set to the negative current position
if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0) diff[i] = -current_position[i];
// If still too far report an error
if (!WITHIN(diff[i], -20, 20)) {
SERIAL_ERROR_MSG(STR_ERR_M428_TOO_FAR);
LCD_ALERTMESSAGE(MSG_ERR_M428_TOO_FAR);
@ -96,12 +100,12 @@ void GcodeSuite::M428() {
return;
}
}
else {diff[i] = 0;}
else
diff[i] = 0;
}
if (parser.seen_test('P')) {LOOP_NUM_AXES(i) set_home_offset((AxisEnum)i, diff[i]+ home_offset[i]);}
else {LOOP_NUM_AXES(i) set_home_offset((AxisEnum)i, diff[i]);}
LOOP_NUM_AXES(i) set_home_offset((AxisEnum)i, diff[i] + adding ? home_offset[i] : 0);
report_current_position();
LCD_MESSAGE(MSG_HOME_OFFSETS_APPLIED);
OKAY_BUZZ();