Eliminate multiple DEFAULT_ACCELERATION declarations.

Re-calculate and fix the Junction Deviation value using correct DEFAULT_ACCELERATION number.
This commit is contained in:
Roxy-3D 2019-10-11 16:31:24 -05:00 committed by GitHub
parent 1df90aaf0e
commit 7a1fa2177c
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23

View file

@ -786,18 +786,12 @@
* M204 R Retract Acceleration * M204 R Retract Acceleration
* M204 T Travel Acceleration * M204 T Travel Acceleration
*/ */
//#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves
//#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts
//#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
// ANET A6 Firmware V2.0 defaults: // ANET A6 Firmware V2.0 defaults:
// Accel: 1000 A-retract: 1000 // Accel: 1000 A-retract: 1000
#define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves #define DEFAULT_ACCELERATION 1000 // X, Y, Z and E acceleration for printing moves
#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
//#define DEFAULT_ACCELERATION 2000 // X, Y, Z and E acceleration for printing moves
//#define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
//#define DEFAULT_TRAVEL_ACCELERATION 4000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Default Jerk limits (mm/s) * Default Jerk limits (mm/s)
@ -831,7 +825,7 @@
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html * http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/ */
#if DISABLED(CLASSIC_JERK) #if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.013 // (mm) Distance from real junction edge #define JUNCTION_DEVIATION_MM 0.04 // (mm) Distance from real junction edge
#endif #endif
/** /**