SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4080 from thinkyhead/rc_probe_feedrates

Browse source 
Save / restore feedrate in probing functions
This commit is contained in:
Scott Lahteine 2016-06-18 02:44:52 -07:00 committed by GitHub
commit da526f6ba9
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Marlin/Marlin_main.cpp
View file

@ -1667,6 +1667,8 @@ static void setup_for_endstop_move() {
static void run_z_probe() { static void run_z_probe() {
float old_feedrate = feedrate;
/** /**
* To prevent stepper_inactive_time from running out and * To prevent stepper_inactive_time from running out and
* EXTRUDER_RUNOUT_PREVENT from extruding * EXTRUDER_RUNOUT_PREVENT from extruding
@ -1743,6 +1745,8 @@ static void setup_for_endstop_move() {
#endif #endif
#endif // !DELTA #endif // !DELTA
feedrate = old_feedrate;
} }
/** /**
@ -1750,7 +1754,7 @@ static void setup_for_endstop_move() {
* The final current_position may not be the one that was requested * The final current_position may not be the one that was requested
*/ */
static void do_blocking_move_to(float x, float y, float z) { static void do_blocking_move_to(float x, float y, float z) {
float oldFeedRate = feedrate; float old_feedrate = feedrate;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) print_xyz("do_blocking_move_to", x, y, z); if (DEBUGGING(LEVELING)) print_xyz("do_blocking_move_to", x, y, z);
@ -1758,7 +1762,7 @@ static void setup_for_endstop_move() {
#if ENABLED(DELTA) #if ENABLED(DELTA)
feedrate = XY_TRAVEL_SPEED; feedrate = xy_travel_speed;
destination[X_AXIS] = x; destination[X_AXIS] = x;
destination[Y_AXIS] = y; destination[Y_AXIS] = y;
@ -1769,8 +1773,6 @@ static void setup_for_endstop_move() {
else else
prepare_move_to_destination(); // this will also set_current_to_destination prepare_move_to_destination(); // this will also set_current_to_destination
stepper.synchronize();
#else #else
feedrate = homing_feedrate[Z_AXIS]; feedrate = homing_feedrate[Z_AXIS];
@ -1784,11 +1786,12 @@ static void setup_for_endstop_move() {
current_position[X_AXIS] = x; current_position[X_AXIS] = x;
current_position[Y_AXIS] = y; current_position[Y_AXIS] = y;
line_to_current_position(); line_to_current_position();
stepper.synchronize();
#endif #endif
feedrate = oldFeedRate; stepper.synchronize();
feedrate = old_feedrate;
} }
inline void do_blocking_move_to_xy(float x, float y) { inline void do_blocking_move_to_xy(float x, float y) {
@ -1838,6 +1841,8 @@ static void setup_for_endstop_move() {
DEPLOY_Z_SERVO(); DEPLOY_Z_SERVO();
#elif ENABLED(Z_PROBE_ALLEN_KEY) #elif ENABLED(Z_PROBE_ALLEN_KEY)
float old_feedrate = feedrate;
feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE; feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE;
// If endstop is already false, the Z probe is deployed // If endstop is already false, the Z probe is deployed
@ -1849,7 +1854,6 @@ static void setup_for_endstop_move() {
if (z_min_endstop) if (z_min_endstop)
#endif #endif
{ {
// Move to the start position to initiate deployment // Move to the start position to initiate deployment
destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_X; destination[X_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_X;
destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Y; destination[Y_AXIS] = Z_PROBE_ALLEN_KEY_DEPLOY_1_Y;
@ -1886,10 +1890,12 @@ static void setup_for_endstop_move() {
} }
// Partially Home X,Y for safety // Partially Home X,Y for safety
destination[X_AXIS] = destination[X_AXIS] * 0.75; destination[X_AXIS] *= 0.75;
destination[Y_AXIS] = destination[Y_AXIS] * 0.75; destination[Y_AXIS] *= 0.75;
prepare_move_to_destination_raw(); // this will also set_current_to_destination prepare_move_to_destination_raw(); // this will also set_current_to_destination
feedrate = old_feedrate;
stepper.synchronize(); stepper.synchronize();
#if ENABLED(Z_MIN_PROBE_ENDSTOP) #if ENABLED(Z_MIN_PROBE_ENDSTOP)
@ -1943,6 +1949,8 @@ static void setup_for_endstop_move() {
#elif ENABLED(Z_PROBE_ALLEN_KEY) #elif ENABLED(Z_PROBE_ALLEN_KEY)
float old_feedrate = feedrate;
// Move up for safety // Move up for safety
feedrate = Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE; feedrate = Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE;
@ -1983,6 +1991,8 @@ static void setup_for_endstop_move() {
destination[Y_AXIS] = 0; destination[Y_AXIS] = 0;
prepare_move_to_destination_raw(); // this will also set_current_to_destination prepare_move_to_destination_raw(); // this will also set_current_to_destination
feedrate = old_feedrate;
stepper.synchronize(); stepper.synchronize();
#if ENABLED(Z_MIN_PROBE_ENDSTOP) #if ENABLED(Z_MIN_PROBE_ENDSTOP)
@ -3829,9 +3839,8 @@ inline void gcode_G28() {
// TODO: clear the leveling matrix or the planner will be set incorrectly // TODO: clear the leveling matrix or the planner will be set incorrectly
setup_for_endstop_move(); // Too late. Must be done before deploying. setup_for_endstop_move(); // Too late. Must be done before deploying.
feedrate = homing_feedrate[Z_AXIS];
run_z_probe(); run_z_probe();
SERIAL_PROTOCOLPGM("Bed X: "); SERIAL_PROTOCOLPGM("Bed X: ");
SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001); SERIAL_PROTOCOL(current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER + 0.0001);
SERIAL_PROTOCOLPGM(" Y: "); SERIAL_PROTOCOLPGM(" Y: ");