Bring some configs up to date
This commit is contained in:
parent
659d06d9b9
commit
e349b1c920
11 changed files with 100 additions and 32 deletions
|
@ -749,9 +749,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -749,9 +749,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -749,9 +749,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -750,9 +750,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -745,9 +745,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
@ -2021,8 +2027,16 @@
|
||||||
//=============================================================================
|
//=============================================================================
|
||||||
|
|
||||||
//
|
//
|
||||||
// CONTROLLER TYPE: Keypad / Add-on
|
// Alfawise U30 ILI9341 2.8 TP Ver 1.2
|
||||||
|
// (Blue PCB on the back of touchscreen)
|
||||||
//
|
//
|
||||||
|
//#define TOUCH_BUTTONS
|
||||||
|
#if ENABLED(TOUCH_BUTTONS)
|
||||||
|
#define XPT2046_X_CALIBRATION 12316
|
||||||
|
#define XPT2046_Y_CALIBRATION -8981
|
||||||
|
#define XPT2046_X_OFFSET -43
|
||||||
|
#define XPT2046_Y_OFFSET 257
|
||||||
|
#endif
|
||||||
|
|
||||||
//
|
//
|
||||||
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
|
// RepRapWorld REPRAPWORLD_KEYPAD v1.1
|
||||||
|
|
|
@ -750,9 +750,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -747,9 +747,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -1173,7 +1173,7 @@
|
||||||
//#define BABYSTEP_WITHOUT_HOMING
|
//#define BABYSTEP_WITHOUT_HOMING
|
||||||
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
//#define BABYSTEP_XY // Also enable X/Y Babystepping. Not supported on DELTA!
|
||||||
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
|
#define BABYSTEP_INVERT_Z false // Change if Z babysteps should go the other way
|
||||||
#define BABYSTEP_MULTIPLICATOR 25 // Babysteps are very small. Increase for faster motion.
|
#define BABYSTEP_MULTIPLICATOR 25 // Babysteps are very small. Increase for faster motion.
|
||||||
|
|
||||||
#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
|
#define DOUBLECLICK_FOR_Z_BABYSTEPPING // Double-click on the Status Screen for Z Babystepping.
|
||||||
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
|
#if ENABLED(DOUBLECLICK_FOR_Z_BABYSTEPPING)
|
||||||
|
|
|
@ -747,9 +747,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
#define JUNCTION_DEVIATION
|
#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -747,9 +747,15 @@
|
||||||
#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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
#define JUNCTION_DEVIATION
|
#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
|
@ -750,9 +750,15 @@
|
||||||
#define DEFAULT_RETRACT_ACCELERATION 10000 // E acceleration for retracts
|
#define DEFAULT_RETRACT_ACCELERATION 10000 // 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
|
* Junction Deviation
|
||||||
//
|
*
|
||||||
|
* Use Junction Deviation instead of traditional Jerk Limiting
|
||||||
|
*
|
||||||
|
* See:
|
||||||
|
* https://reprap.org/forum/read.php?1,739819
|
||||||
|
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
|
||||||
|
*/
|
||||||
//#define JUNCTION_DEVIATION
|
//#define JUNCTION_DEVIATION
|
||||||
#if ENABLED(JUNCTION_DEVIATION)
|
#if ENABLED(JUNCTION_DEVIATION)
|
||||||
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
|
||||||
|
|
Reference in a new issue