|
@@ -757,36 +757,39 @@
|
757
|
757
|
#define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves
|
758
|
758
|
|
759
|
759
|
/**
|
760
|
|
- * Junction Deviation
|
761
|
|
- *
|
762
|
|
- * Use Junction Deviation instead of traditional Jerk Limiting
|
763
|
|
- *
|
764
|
|
- * See:
|
765
|
|
- * https://reprap.org/forum/read.php?1,739819
|
766
|
|
- * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
767
|
|
- */
|
768
|
|
-//#define JUNCTION_DEVIATION
|
769
|
|
-#if ENABLED(JUNCTION_DEVIATION)
|
770
|
|
- #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
771
|
|
-#endif
|
772
|
|
-
|
773
|
|
-/**
|
774
|
|
- * Default Jerk (mm/s)
|
|
760
|
+ * Default Jerk limits (mm/s)
|
775
|
761
|
* Override with M205 X Y Z E
|
776
|
762
|
*
|
777
|
763
|
* "Jerk" specifies the minimum speed change that requires acceleration.
|
778
|
764
|
* When changing speed and direction, if the difference is less than the
|
779
|
765
|
* value set here, it may happen instantaneously.
|
780
|
766
|
*/
|
781
|
|
-#if DISABLED(JUNCTION_DEVIATION)
|
782
|
|
- #define DEFAULT_XJERK 8.0
|
783
|
|
- #define DEFAULT_YJERK 8.0
|
784
|
|
- #define DEFAULT_ZJERK 0.4
|
|
767
|
+//#define CLASSIC_JERK
|
|
768
|
+#if ENABLED(CLASSIC_JERK)
|
|
769
|
+ #define DEFAULT_XJERK 8.0
|
|
770
|
+ #define DEFAULT_YJERK 8.0
|
|
771
|
+ #define DEFAULT_ZJERK 0.4
|
|
772
|
+
|
|
773
|
+ //#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
|
|
774
|
+ #if ENABLED(LIMITED_JERK_EDITING)
|
|
775
|
+ #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
|
|
776
|
+ #endif
|
785
|
777
|
#endif
|
786
|
778
|
|
787
|
779
|
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
|
788
|
780
|
|
789
|
781
|
/**
|
|
782
|
+ * Junction Deviation Factor
|
|
783
|
+ *
|
|
784
|
+ * See:
|
|
785
|
+ * https://reprap.org/forum/read.php?1,739819
|
|
786
|
+ * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
|
787
|
+ */
|
|
788
|
+#if DISABLED(CLASSIC_JERK)
|
|
789
|
+ #define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
|
790
|
+#endif
|
|
791
|
+
|
|
792
|
+/**
|
790
|
793
|
* S-Curve Acceleration
|
791
|
794
|
*
|
792
|
795
|
* This option eliminates vibration during printing by fitting a Bézier
|