|
|
|
@ -757,35 +757,38 @@
|
|
|
|
|
#define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Junction Deviation
|
|
|
|
|
*
|
|
|
|
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
|
|
|
|
*
|
|
|
|
|
* See:
|
|
|
|
|
* https://reprap.org/forum/read.php?1,739819
|
|
|
|
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
|
|
|
|
*/
|
|
|
|
|
//#define JUNCTION_DEVIATION
|
|
|
|
|
#if ENABLED(JUNCTION_DEVIATION)
|
|
|
|
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Default Jerk (mm/s)
|
|
|
|
|
* Default Jerk limits (mm/s)
|
|
|
|
|
* Override with M205 X Y Z E
|
|
|
|
|
*
|
|
|
|
|
* "Jerk" specifies the minimum speed change that requires acceleration.
|
|
|
|
|
* When changing speed and direction, if the difference is less than the
|
|
|
|
|
* value set here, it may happen instantaneously.
|
|
|
|
|
*/
|
|
|
|
|
#if DISABLED(JUNCTION_DEVIATION)
|
|
|
|
|
//#define CLASSIC_JERK
|
|
|
|
|
#if ENABLED(CLASSIC_JERK)
|
|
|
|
|
#define DEFAULT_XJERK 8.0
|
|
|
|
|
#define DEFAULT_YJERK 8.0
|
|
|
|
|
#define DEFAULT_ZJERK 0.4
|
|
|
|
|
|
|
|
|
|
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
|
|
|
|
|
#if ENABLED(LIMITED_JERK_EDITING)
|
|
|
|
|
#define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Junction Deviation Factor
|
|
|
|
|
*
|
|
|
|
|
* See:
|
|
|
|
|
* https://reprap.org/forum/read.php?1,739819
|
|
|
|
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
|
|
|
|
*/
|
|
|
|
|
#if DISABLED(CLASSIC_JERK)
|
|
|
|
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* S-Curve Acceleration
|
|
|
|
|
*
|
|
|
|
|