3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-12-29 02:40:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

move within axis test

Browse source
This commit is contained in:
Scott Lahteine 2024-10-04 16:58:18 -05:00
parent 7ac255b92e
commit 6ea7af1291
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -237,14 +237,6 @@ void GcodeSuite::G28() {
return;
}
#if ENABLED(EDITABLE_HOMING_FEEDRATE)
REMEMBER(fr, homing_feedrate_mm_m);
float override_fr_units_min = parser.floatval('F');
NOLESS(override_fr_units_min, 0.0f);
#else
constexpr float override_fr_units_min = 0.0f;
#endif
#if ENABLED(FULL_REPORT_TO_HOST_FEATURE)
const M_StateEnum old_grblstate = M_State_grbl;
set_and_report_grblstate(M_HOMING);
@ -307,9 +299,14 @@ void GcodeSuite::G28() {
bool finalRaiseZ = false;
#endif
// Allow 'G28 F<feedrate>' to override specified homing axes
#if ENABLED(EDITABLE_HOMING_FEEDRATE)
REMEMBER(fr, homing_feedrate_mm_m);
float override_fr_units_min = parser.floatval('F');
NOLESS(override_fr_units_min, 0.0f);
#define SET_AXIS_FR(A) homing_feedrate_mm_m.A = A##_AXIS_UNIT(override_fr_units_min);
#else
constexpr float override_fr_units_min = 0.0f;
#define SET_AXIS_FR(...) NOOP;
#endif
@ -539,6 +536,9 @@ void GcodeSuite::G28() {
endstops.not_homing();
// Restore feedrates before any machine-dependent moves
TERN_(EDITABLE_HOMING_FEEDRATE, RESTORE(fr));
// Clear endstop state for polled stallGuard endstops
TERN_(SPI_ENDSTOPS, endstops.clear_endstop_state());