Move JD to Config.h (and fix jerk->eeprom bug) (#12720)

This commit is contained in:
Ludy 2018-12-27 22:29:39 +01:00 committed by Scott Lahteine
parent 594898aea7
commit cfc5e96b4b
148 changed files with 1250 additions and 851 deletions

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -689,6 +689,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -697,10 +705,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 8.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 8.0
#define DEFAULT_EJERK 10.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 10.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -714,6 +714,13 @@
//#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts //#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
//#define DEFAULT_TRAVEL_ACCELERATION 4000 // X, Y, Z acceleration for travel (non printing) moves //#define DEFAULT_TRAVEL_ACCELERATION 4000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
@ -725,10 +732,13 @@
*/ */
// ANET A6 Firmware V2.0 defaults (jerk): // ANET A6 Firmware V2.0 defaults (jerk):
// Vxy-jerk: 10, Vz-jerk: +000.30, Ve-jerk: 5 // Vxy-jerk: 10, Vz-jerk: +000.30, Ve-jerk: 5
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -481,14 +481,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -682,6 +682,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -690,10 +698,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -681,6 +681,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -689,10 +697,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 8.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 8.0
#define DEFAULT_EJERK 1.5 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_EJERK 1.5 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -465,14 +465,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1100 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 7.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 7.0 #define DEFAULT_XJERK 7.0
#define DEFAULT_ZJERK 0.65 #define DEFAULT_YJERK 7.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.65
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -481,14 +481,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1100 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 7.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 7.0 #define DEFAULT_XJERK 7.0
#define DEFAULT_ZJERK 0.65 #define DEFAULT_YJERK 7.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.65
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -657,6 +657,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -665,10 +673,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -670,6 +670,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1300 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1300 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -678,10 +686,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 5.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 5.0
#define DEFAULT_EJERK 10.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 10.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -657,6 +657,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -665,10 +673,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -668,6 +668,14 @@
#define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -676,10 +684,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 2.7 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 2.7
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -688,6 +688,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -696,10 +704,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 20.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 20.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -679,6 +679,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -687,10 +695,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 20.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 20.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 2.4 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 2.4
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -681,6 +681,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -689,10 +697,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -651,6 +651,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -659,10 +667,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -651,6 +651,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -659,10 +667,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -675,6 +675,14 @@
#define DEFAULT_RETRACT_ACCELERATION 400 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 400 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -683,10 +691,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 8.5 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 8.5 #define DEFAULT_XJERK 8.5
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 8.5
#define DEFAULT_EJERK 4.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -744,6 +744,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -752,19 +760,21 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if ENABLED(X_SpreadCycle) || DISABLED(X_2208) #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_XJERK 20.0 #if ENABLED(X_SpreadCycle) || DISABLED(X_2208)
#else #define DEFAULT_XJERK 20.0
#define DEFAULT_XJERK 10.0 #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
#endif #endif
#if ENABLED(Y_SpreadCycle) || DISABLED(Y_2208) #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
#define DEFAULT_YJERK 10.0
#else
#define DEFAULT_YJERK 5.0
#endif
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -698,6 +698,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -706,10 +714,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 12.0 // More conservitive numbers. #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 8.0 #define DEFAULT_XJERK 12.0 // More conservative numbers.
#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 8.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -486,14 +486,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -685,6 +685,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1500 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -693,15 +701,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
//#define DEFAULT_XJERK 20.0 #if DISABLED(JUNCTION_DEVIATION)
//#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 12.0 // More conservative numbers.
//#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 8.0
//#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_XJERK 12.0 // More conservitive numbers. #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -487,14 +487,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -684,6 +684,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -692,10 +700,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 5.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 5.0
#define DEFAULT_EJERK 4.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -676,6 +676,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -684,10 +692,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 0 #define DEFAULT_XJERK 0
#define DEFAULT_ZJERK 0.6 #define DEFAULT_YJERK 0
#define DEFAULT_EJERK 50.0 #define DEFAULT_ZJERK 0.6
#endif
#define DEFAULT_EJERK 50.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.01 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -684,6 +684,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -692,10 +700,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -684,6 +684,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -692,10 +700,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -681,6 +681,14 @@
#define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 800 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -689,10 +697,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 8.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 3.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 3.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -689,6 +689,14 @@
#define DEFAULT_RETRACT_ACCELERATION 100 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 100 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION MAX_XYAXIS_ACCEL // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION MAX_XYAXIS_ACCEL // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -697,10 +705,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 2.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 2.0 #define DEFAULT_XJERK 2.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 2.0
#define DEFAULT_EJERK 8.0 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_EJERK 8.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -689,6 +689,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -697,10 +705,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 8.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 8.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -668,6 +668,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -676,10 +684,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK DEFAULT_XJERK #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta #define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -673,6 +673,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -681,10 +689,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK DEFAULT_XJERK #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta #define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -670,6 +670,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -678,10 +686,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -709,6 +709,14 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -717,10 +725,13 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -667,6 +667,14 @@
#define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 1000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -675,10 +683,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 8.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 8.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -682,6 +682,14 @@
#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -690,10 +698,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 5.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 5.0
#define DEFAULT_EJERK 3.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 3.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -671,6 +671,14 @@
#define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 5000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -679,10 +687,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 13.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 13.0 #define DEFAULT_XJERK 13.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 13.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -700,6 +700,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -708,10 +716,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -720,6 +720,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -728,10 +736,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 10.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 10.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds. // if unwanted behavior is observed on a user's machine when running at very slow speeds.
#define MINIMUM_PLANNER_SPEED 0.05 // (mm/s) #define MINIMUM_PLANNER_SPEED 0.05 // (mm/s)
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
// //
// Backlash Compensation // Backlash Compensation
// Adds extra movement to axes on direction-changes to account for backlash. // Adds extra movement to axes on direction-changes to account for backlash.

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 20.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 20.0 #define DEFAULT_XJERK 20.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_YJERK 20.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.3
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

View file

@ -669,6 +669,14 @@
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
//
// Use Junction Deviation instead of traditional Jerk Limiting
//
//#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 (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
@ -677,10 +685,13 @@
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#define DEFAULT_XJERK 15.0 #if DISABLED(JUNCTION_DEVIATION)
#define DEFAULT_YJERK 15.0 #define DEFAULT_XJERK 15.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_YJERK 15.0
#define DEFAULT_EJERK 5.0 #define DEFAULT_ZJERK 0.4
#endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* S-Curve Acceleration * S-Curve Acceleration

Some files were not shown because too many files have changed in this diff Show more