diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-07-17 14:03:19 +0200 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-07-17 14:03:19 +0200 |
| commit | 87c0fbba3e0cb2aa40014b09c4e7e308b9408cd1 (patch) | |
| tree | 21cd1f55802766e3b72303dc036191830d6b83d5 | |
| parent | 2f2839b35a8d16db92f6beddb8cdf3c7a086668e (diff) | |
| parent | b136a652c4a244038d0db40894e3558805d7c73a (diff) | |
Merge branch 'master' into experimental
| -rw-r--r-- | Sprinter/Configuration.h | 1 | ||||
| -rw-r--r-- | Sprinter/Sprinter.pde | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Sprinter/Configuration.h b/Sprinter/Configuration.h index a9cb67f..5f1e1d4 100644 --- a/Sprinter/Configuration.h +++ b/Sprinter/Configuration.h @@ -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 diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index 3e5fa1e..b0400cd 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -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; |