Merge branch 'master' into experimental

This commit is contained in:
kliment 2011-07-17 14:03:19 +02:00
commit 87c0fbba3e
2 changed files with 4 additions and 3 deletions

View file

@ -84,6 +84,7 @@ bool axis_relative_modes[] = {false, false, false, false};
// If you enable this, make sure STEP_DELAY_MICROS is disabled. (except for Gen6: both need to be enabled.)
//#define STEP_DELAY_RATIO 0.25
float homing_feedrate[] = {1500,1500,120};
// Comment this to disable ramp acceleration
#define RAMP_ACCELERATION 1

View file

@ -551,7 +551,7 @@ inline void process_commands()
if ((X_MIN_PIN > -1 && X_HOME_DIR==-1) || (X_MAX_PIN > -1 && X_HOME_DIR==1)){
current_position[0] = 0;
destination[0] = 1.5 * X_MAX_LENGTH * X_HOME_DIR;
feedrate = max_start_speed_units_per_second[0] * 60;
feedrate = homing_feedrate[0];
prepare_move();
current_position[0] = 0;
@ -571,7 +571,7 @@ inline void process_commands()
if ((Y_MIN_PIN > -1 && Y_HOME_DIR==-1) || (Y_MAX_PIN > -1 && Y_HOME_DIR==1)){
current_position[1] = 0;
destination[1] = 1.5 * Y_MAX_LENGTH * Y_HOME_DIR;
feedrate = max_start_speed_units_per_second[1] * 60;
feedrate = homing_feedrate[1];
prepare_move();
current_position[1] = 0;
@ -591,7 +591,7 @@ inline void process_commands()
if ((Z_MIN_PIN > -1 && Z_HOME_DIR==-1) || (Z_MAX_PIN > -1 && Z_HOME_DIR==1)){
current_position[2] = 0;
destination[2] = 1.5 * Z_MAX_LENGTH * Z_HOME_DIR;
feedrate = max_feedrate[2]/2;
feedrate = homing_feedrate[2];
prepare_move();
current_position[2] = 0;