|
@@ -678,6 +678,14 @@
|
678
|
678
|
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
|
679
|
679
|
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
|
680
|
680
|
|
|
681
|
+//
|
|
682
|
+// Use Junction Deviation instead of traditional Jerk Limiting
|
|
683
|
+//
|
|
684
|
+//#define JUNCTION_DEVIATION
|
|
685
|
+#if ENABLED(JUNCTION_DEVIATION)
|
|
686
|
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
|
687
|
+#endif
|
|
688
|
+
|
681
|
689
|
/**
|
682
|
690
|
* Default Jerk (mm/s)
|
683
|
691
|
* Override with M205 X Y Z E
|
|
@@ -686,10 +694,13 @@
|
686
|
694
|
* When changing speed and direction, if the difference is less than the
|
687
|
695
|
* value set here, it may happen instantaneously.
|
688
|
696
|
*/
|
689
|
|
-#define DEFAULT_XJERK 20.0
|
690
|
|
-#define DEFAULT_YJERK 15.0
|
691
|
|
-#define DEFAULT_ZJERK 0.4
|
692
|
|
-#define DEFAULT_EJERK 5.0
|
|
697
|
+#if DISABLED(JUNCTION_DEVIATION)
|
|
698
|
+ #define DEFAULT_XJERK 20.0
|
|
699
|
+ #define DEFAULT_YJERK 15.0
|
|
700
|
+ #define DEFAULT_ZJERK 0.4
|
|
701
|
+#endif
|
|
702
|
+
|
|
703
|
+#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
|
693
|
704
|
|
694
|
705
|
/**
|
695
|
706
|
* S-Curve Acceleration
|