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

7
Marlin/src/module/motion.cpp
View File

@ -439,12 +439,15 @@ void do_blocking_move_to_xy(const float &rx, const float &ry, const float &fr_mm
//
static float saved_feedrate_mm_s;
static int16_t saved_feedrate_percentage;
void setup_for_endstop_or_probe_move() {
void remember_feedrate_and_scaling() {
saved_feedrate_mm_s = feedrate_mm_s;
saved_feedrate_percentage = feedrate_percentage;
}
void remember_feedrate_scaling_off() {
remember_feedrate_and_scaling();
feedrate_percentage = 100;
}
void clean_up_after_endstop_or_probe_move() {
void restore_feedrate_and_scaling() {
feedrate_mm_s = saved_feedrate_mm_s;
feedrate_percentage = saved_feedrate_percentage;
}

5
Marlin/src/module/motion.h
View File

@ -203,8 +203,9 @@ FORCE_INLINE void do_blocking_move_to(const float (&raw)[XYZE], const float &fr_
do_blocking_move_to(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], fr_mm_s);
}
void setup_for_endstop_or_probe_move();
void clean_up_after_endstop_or_probe_move();
void remember_feedrate_and_scaling();
void remember_feedrate_scaling_off();
void restore_feedrate_and_scaling();
//
// Homing