zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improve and clarify M428 code

Browse source
This commit is contained in:
Scott Lahteine 2017-11-13 01:34:19 -06:00
parent c009a990e4
commit 04abd8d459
2 changed files with 18 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,6 @@ void GcodeSuite::M206() {
if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_linear_units()); // Psi if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_linear_units()); // Psi
#endif #endif
SYNC_PLAN_POSITION_KINEMATIC();
report_current_position(); report_current_position();
} }
@ -63,32 +62,27 @@ void GcodeSuite::M206() {
* Use M206 to set these values directly. * Use M206 to set these values directly.
*/ */
void GcodeSuite::M428() { void GcodeSuite::M428() {
bool err = false; if (axis_unhomed_error()) return;
float diff[XYZ];
LOOP_XYZ(i) { LOOP_XYZ(i) {
if (axis_homed[i]) { diff[i] = base_home_pos((AxisEnum)i) - current_position[i];
const float base = (current_position[i] > (soft_endstop_min[i] + soft_endstop_max[i]) * 0.5) ? base_home_pos((AxisEnum)i) : 0, if (!WITHIN(diff[i], -20, 20) && home_dir((AxisEnum)i) > 0)
diff = base - current_position[i]; diff[i] = -current_position[i];
if (WITHIN(diff, -20, 20)) { if (!WITHIN(diff[i], -20, 20)) {
set_home_offset((AxisEnum)i, diff);
}
else {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLNPGM(MSG_ERR_M428_TOO_FAR); SERIAL_ERRORLNPGM(MSG_ERR_M428_TOO_FAR);
LCD_ALERTMESSAGEPGM("Err: Too far!"); LCD_ALERTMESSAGEPGM("Err: Too far!");
BUZZ(200, 40); BUZZ(200, 40);
err = true; return;
break;
}
} }
} }
if (!err) { LOOP_XYZ(i) set_home_offset((AxisEnum)i, diff[i]);
SYNC_PLAN_POSITION_KINEMATIC();
report_current_position(); report_current_position();
LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED); LCD_MESSAGEPGM(MSG_HOME_OFFSETS_APPLIED);
BUZZ(100, 659); BUZZ(100, 659);
BUZZ(100, 698); BUZZ(100, 698);
}
} }
#endif // HAS_M206_COMMAND #endif // HAS_M206_COMMAND

1
Marlin/src/module/motion.h
View file

@ -173,6 +173,7 @@ void clean_up_after_endstop_or_probe_move();
|| ENABLED(NOZZLE_CLEAN_FEATURE) \ || ENABLED(NOZZLE_CLEAN_FEATURE) \
|| ENABLED(NOZZLE_PARK_FEATURE) \ || ENABLED(NOZZLE_PARK_FEATURE) \
|| (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)) \ || (ENABLED(ADVANCED_PAUSE_FEATURE) && ENABLED(HOME_BEFORE_FILAMENT_CHANGE)) \
|| HAS_M206_COMMAND \
) || ENABLED(NO_MOTION_BEFORE_HOMING) ) || ENABLED(NO_MOTION_BEFORE_HOMING)
#if HAS_AXIS_UNHOMED_ERR #if HAS_AXIS_UNHOMED_ERR