Followup for 16277

This commit is contained in:
Scott Lahteine 2020-01-18 15:49:59 -06:00
parent e9a68e9e97
commit 86cc5191a9
116 changed files with 126 additions and 37 deletions

View file

@ -724,6 +724,7 @@
//#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988
//#define Z3_DRIVER_TYPE A4988
//#define Z4_DRIVER_TYPE A4988
//#define E0_DRIVER_TYPE A4988
//#define E1_DRIVER_TYPE A4988
//#define E2_DRIVER_TYPE A4988
@ -844,13 +845,6 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
#if ENABLED(Y_SPREADCYCLE) || DISABLED(Y_2208)
#define DEFAULT_YJERK 10.0
#else
#define DEFAULT_YJERK 5.0
#endif
//#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#if ENABLED(X_SPREADCYCLE) || DISABLED(X_2208)
@ -858,6 +852,11 @@
#else
#define DEFAULT_XJERK 10.0
#endif
#if ENABLED(Y_SPREADCYCLE) || DISABLED(Y_2208)
#define DEFAULT_YJERK 10.0
#else
#define DEFAULT_YJERK 5.0
#endif
#define DEFAULT_ZJERK 0.4
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
@ -876,7 +875,7 @@
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM (.4 * sq(DEFAULT_YJERK) / DEFAULT_ACCELERATION) // (mm) Distance from real junction edge
#define JUNCTION_DEVIATION_MM (.4 * DEFAULT_YJERK * DEFAULT_YJERK / DEFAULT_ACCELERATION) // (mm) Distance from real junction edge
#endif
/**

View file

@ -697,6 +697,7 @@
//#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988
//#define Z3_DRIVER_TYPE A4988
//#define Z4_DRIVER_TYPE A4988
//#define E0_DRIVER_TYPE A4988
//#define E1_DRIVER_TYPE A4988
//#define E2_DRIVER_TYPE A4988

View file

@ -674,6 +674,7 @@
//#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988
//#define Z3_DRIVER_TYPE A4988
//#define Z4_DRIVER_TYPE A4988
//#define E0_DRIVER_TYPE A4988
//#define E1_DRIVER_TYPE A4988
//#define E2_DRIVER_TYPE A4988