bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Rename some feedrate-oriented functions

Browse Source
This commit is contained in:
Scott Lahteine
2019-09-23 20:58:01 -05:00
parent 938a49f989
commit 5e13fe989f
8 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -261,7 +261,7 @@ void GcodeSuite::G28(const bool always_home_all) {
extruder_duplication_enabled = false;
#endif
setup_for_endstop_or_probe_move();
remember_feedrate_scaling_off();
endstops.enable(true); // Enable endstops for next homing move
@ -427,7 +427,7 @@ void GcodeSuite::G28(const bool always_home_all) {
set_bed_leveling_enabled(leveling_was_active);
#endif
clean_up_after_endstop_or_probe_move();
restore_feedrate_and_scaling();
// Restore the active tool after homing
#if HOTENDS > 1 && (DISABLED(DELTA) || ENABLED(DELTA_HOME_TO_SAFE_ZONE))

4
Marlin/src/gcode/calibrate/G33.cpp
View File

@ -84,7 +84,7 @@ void ac_setup(const bool reset_bed) {
#endif
planner.synchronize();
setup_for_endstop_or_probe_move();
remember_feedrate_scaling_off();
#if HAS_LEVELING
if (reset_bed) reset_bed_level(); // After full calibration bed-level data is no longer valid
@ -102,7 +102,7 @@ void ac_cleanup(
#if HAS_BED_PROBE
STOW_PROBE();
#endif
clean_up_after_endstop_or_probe_move();
restore_feedrate_and_scaling();
#if HOTENDS > 1
tool_change(old_tool_index, true);
#endif

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

@ -111,7 +111,7 @@ void GcodeSuite::M48() {
set_bed_leveling_enabled(false);
#endif
setup_for_endstop_or_probe_move();
remember_feedrate_scaling_off();
float mean = 0.0, sigma = 0.0, min = 99999.9, max = -99999.9, sample_set[n_samples];
@ -256,7 +256,7 @@ void GcodeSuite::M48() {
#endif
}
clean_up_after_endstop_or_probe_move();
restore_feedrate_and_scaling();
// Re-enable bed level correction if it had been on
#if HAS_LEVELING