fix zjerk being the same for delta as xy jerk

add more delta defaults
on delta make second home even slower
This commit is contained in:
Jim Morris 2013-07-17 16:14:07 -07:00
parent f3aa2a48e7
commit d01ee7e7b5
3 changed files with 11 additions and 0 deletions

View File

@ -431,7 +431,11 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
// The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
#define DEFAULT_XYJERK 20.0 // (mm/sec) #define DEFAULT_XYJERK 20.0 // (mm/sec)
#ifdef DELTA
#define DEFAULT_ZJERK 20.0 // (mm/sec) Must be same as XY for delta
#else
#define DEFAULT_ZJERK 0.4 // (mm/sec) #define DEFAULT_ZJERK 0.4 // (mm/sec)
#endif // DELTA
#define DEFAULT_EJERK 5.0 // (mm/sec) #define DEFAULT_EJERK 5.0 // (mm/sec)
//=========================================================================== //===========================================================================

View File

@ -177,7 +177,10 @@
#define DEFAULT_MINSEGMENTTIME 20000 #define DEFAULT_MINSEGMENTTIME 20000
// If defined the movements slow down when the look ahead buffer is only half full // If defined the movements slow down when the look ahead buffer is only half full
// (don't use SLOWDOWN with DELTA because DELTA generates hundreds of segments per second)
#ifndef DELTA
#define SLOWDOWN #define SLOWDOWN
#endif
// Frequency limit // Frequency limit
// See nophead's blog for more info // See nophead's blog for more info

View File

@ -712,7 +712,11 @@ static void homeaxis(int axis) {
st_synchronize(); st_synchronize();
destination[axis] = 2*home_retract_mm(axis) * home_dir(axis); destination[axis] = 2*home_retract_mm(axis) * home_dir(axis);
#ifdef DELTA
feedrate = homing_feedrate[axis]/10;
#else
feedrate = homing_feedrate[axis]/2 ; feedrate = homing_feedrate[axis]/2 ;
#endif
plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder); plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
st_synchronize(); st_synchronize();