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/probe/G30.cpp
View File

@@ -49,7 +49,7 @@ void GcodeSuite::G30() {
set_bed_leveling_enabled(false);
#endif
setup_for_endstop_or_probe_move();
remember_feedrate_scaling_off();
const ProbePtRaise raise_after = parser.boolval('E', true) ? PROBE_PT_STOW : PROBE_PT_NONE;
const float measured_z = probe_at_point(xpos, ypos, raise_after, 1);
@@ -57,7 +57,7 @@ void GcodeSuite::G30() {
if (!isnan(measured_z))
SERIAL_ECHOLNPAIR("Bed X: ", FIXFLOAT(xpos), " Y: ", FIXFLOAT(ypos), " Z: ", FIXFLOAT(measured_z));
clean_up_after_endstop_or_probe_move();
restore_feedrate_and_scaling();
#ifdef Z_AFTER_PROBING
if (raise_after == PROBE_PT_STOW) move_z_after_probing();

4
Marlin/src/gcode/probe/G38.cpp
View File

@@ -109,7 +109,7 @@ void GcodeSuite::G38(const int8_t subcode) {
// Get X Y Z E F
get_destination_from_command();
setup_for_endstop_or_probe_move();
remember_feedrate_scaling_off();
const bool error_on_fail =
#if ENABLED(G38_PROBE_AWAY)
@@ -128,7 +128,7 @@ void GcodeSuite::G38(const int8_t subcode) {
break;
}
clean_up_after_endstop_or_probe_move();
restore_feedrate_and_scaling();
}
#endif // G38_PROBE_TARGET