Bring some configs up to date

This commit is contained in:
Scott Lahteine 2019-07-30 04:12:20 -05:00
parent 659d06d9b9
commit e349b1c920
11 changed files with 100 additions and 32 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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