pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into experimental

Browse source
This commit is contained in:
kliment 2011-07-10 20:21:45 +02:00
commit 80710aaaeb
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Sprinter/Sprinter.pde
View file

@ -548,8 +548,8 @@ inline void process_commands()
home_all_axis = !((code_seen(axis_codes[0])) || (code_seen(axis_codes[1])) || (code_seen(axis_codes[2])));
if((home_all_axis) || (code_seen('X'))) {
#if ((X_MIN_PIN > -1 && X_HOME_DIR==-1) || (X_MAX_PIN > -1 && X_HOME_DIR==1))
if((home_all_axis) || (code_seen(axis_codes[0]))) {
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;
@ -565,11 +565,11 @@ inline void process_commands()
current_position[0] = 0;
destination[0] = 0;
feedrate = 0;
#endif
}
}
if((home_all_axis) || (code_seen('X'))) {
#if ((Y_MIN_PIN > -1 && Y_HOME_DIR==-1) || (Y_MAX_PIN > -1 && Y_HOME_DIR==1))
if((home_all_axis) || (code_seen(axis_codes[1]))) {
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;
@ -585,18 +585,18 @@ inline void process_commands()
current_position[1] = 0;
destination[1] = 0;
feedrate = 0;
#endif
}
}
if((home_all_axis) || (code_seen('X'))) {
#if ((Z_MIN_PIN > -1 && Z_HOME_DIR==-1) || (Z_MAX_PIN > -1 && Z_HOME_DIR==1))
if((home_all_axis) || (code_seen(axis_codes[2]))) {
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;
prepare_move();
current_position[2] = 0;
destination[2] = -5 * Z_HOME_DIR;
destination[2] = -2 * Z_HOME_DIR;
prepare_move();
destination[2] = 10 * Z_HOME_DIR;
@ -605,7 +605,8 @@ inline void process_commands()
current_position[2] = 0;
destination[2] = 0;
feedrate = 0;
#endif
}
}
feedrate = saved_feedrate;