thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
Marlin/src/config/examples/Formbot/Raptor/Configuration.h
View File

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

8
Marlin/src/config/examples/Formbot/Raptor/Configuration_adv.h
View File

@@ -482,14 +482,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#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
// Adds extra movement to axes on direction-changes to account for backlash.

19
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration.h
View File

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

8
Marlin/src/config/examples/Formbot/T_Rex_2+/Configuration_adv.h
View File

@@ -486,14 +486,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#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
// Adds extra movement to axes on direction-changes to account for backlash.

22
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration.h
View File

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

8
Marlin/src/config/examples/Formbot/T_Rex_3/Configuration_adv.h
View File

@@ -487,14 +487,6 @@
// if unwanted behavior is observed on a user's machine when running at very slow speeds.
#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
// Adds extra movement to axes on direction-changes to account for backlash.