Browse Source

fix zjerk being the same for delta as xy jerk

add more delta defaults
on delta make second home even slower
Jim Morris 12 years ago
parent
commit
d01ee7e7b5
3 changed files with 11 additions and 0 deletions
  1. 4
    0
      Marlin/Configuration.h
  2. 3
    0
      Marlin/Configuration_adv.h
  3. 4
    0
      Marlin/Marlin_main.cpp

+ 4
- 0
Marlin/Configuration.h View File

431
 
431
 
432
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
432
 // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously)
433
 #define DEFAULT_XYJERK                20.0    // (mm/sec)
433
 #define DEFAULT_XYJERK                20.0    // (mm/sec)
434
+#ifdef DELTA
435
+#define DEFAULT_ZJERK                 20.0    // (mm/sec) Must be same as XY for delta
436
+#else
434
 #define DEFAULT_ZJERK                 0.4     // (mm/sec)
437
 #define DEFAULT_ZJERK                 0.4     // (mm/sec)
438
+#endif // DELTA
435
 #define DEFAULT_EJERK                 5.0    // (mm/sec)
439
 #define DEFAULT_EJERK                 5.0    // (mm/sec)
436
 
440
 
437
 //===========================================================================
441
 //===========================================================================

+ 3
- 0
Marlin/Configuration_adv.h View File

177
 #define DEFAULT_MINSEGMENTTIME        20000
177
 #define DEFAULT_MINSEGMENTTIME        20000
178
 
178
 
179
 // If defined the movements slow down when the look ahead buffer is only half full
179
 // If defined the movements slow down when the look ahead buffer is only half full
180
+// (don't use SLOWDOWN with DELTA because DELTA generates hundreds of segments per second)
181
+#ifndef DELTA
180
 #define SLOWDOWN
182
 #define SLOWDOWN
183
+#endif
181
 
184
 
182
 // Frequency limit
185
 // Frequency limit
183
 // See nophead's blog for more info
186
 // See nophead's blog for more info

+ 4
- 0
Marlin/Marlin_main.cpp View File

712
     st_synchronize();
712
     st_synchronize();
713
 
713
 
714
     destination[axis] = 2*home_retract_mm(axis) * home_dir(axis);
714
     destination[axis] = 2*home_retract_mm(axis) * home_dir(axis);
715
+#ifdef DELTA
716
+    feedrate = homing_feedrate[axis]/10;
717
+#else
715
     feedrate = homing_feedrate[axis]/2 ;
718
     feedrate = homing_feedrate[axis]/2 ;
719
+#endif
716
     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
720
     plan_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], feedrate/60, active_extruder);
717
     st_synchronize();
721
     st_synchronize();
718
 
722
 

Loading…
Cancel
Save