Merge pull request #8887 from thinkyhead/bf2_reduce_jerk_default
[2.0.x] Reduce default jerk. XY by half. Z by 1/4
This commit is contained in:
commit
f218eb0ddf
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -612,21 +612,12 @@
|
||||||
* 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
|
|
||||||
//#define DEFAULT_YJERK 20.0
|
|
||||||
//#define DEFAULT_ZJERK 0.4
|
|
||||||
//#define DEFAULT_EJERK 5.0
|
|
||||||
|
|
||||||
// ANET A6 Firmware V2.0 defaults (jerk):
|
// ANET A6 Firmware V2.0 defaults (jerk):
|
||||||
// Vxy-jerk: 20, Vz-jerk: +000.30, Ve-jerk: 10
|
// Vxy-jerk: 10, Vz-jerk: +000.30, Ve-jerk: 10
|
||||||
#define DEFAULT_XJERK 20.0
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.3
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 10.0
|
#define DEFAULT_EJERK 10.0
|
||||||
//#define DEFAULT_XJERK 20.0
|
|
||||||
//#define DEFAULT_YJERK 20.0
|
|
||||||
//#define DEFAULT_ZJERK 0.3
|
|
||||||
//#define DEFAULT_EJERK 5.0
|
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
//============================= Z Probe Options =============================
|
//============================= Z Probe Options =============================
|
||||||
|
|
|
@ -572,8 +572,8 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.3
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
|
|
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -567,9 +567,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 1.0
|
#define DEFAULT_EJERK 1.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -576,8 +576,8 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 2.7
|
#define DEFAULT_ZJERK 2.7
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
|
|
|
@ -572,9 +572,9 @@
|
||||||
* 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 17.0
|
#define DEFAULT_XJERK 8.5
|
||||||
#define DEFAULT_YJERK 17.0
|
#define DEFAULT_YJERK 8.5
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 4.0
|
#define DEFAULT_EJERK 4.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -581,9 +581,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -570,9 +570,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -588,7 +588,7 @@
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_XJERK 8.0
|
#define DEFAULT_XJERK 8.0
|
||||||
#define DEFAULT_YJERK 8.0
|
#define DEFAULT_YJERK 8.0
|
||||||
#define DEFAULT_ZJERK 0.40
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -565,9 +565,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -570,9 +570,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK 20.0
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -570,9 +570,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -567,9 +567,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -566,7 +566,7 @@
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_XJERK 8.0
|
#define DEFAULT_XJERK 8.0
|
||||||
#define DEFAULT_YJERK 8.0
|
#define DEFAULT_YJERK 8.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -617,9 +617,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -595,9 +595,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -566,9 +566,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -646,9 +646,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK DEFAULT_XJERK
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK DEFAULT_YJERK // Must be same as XY for delta
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -646,9 +646,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK DEFAULT_XJERK
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK DEFAULT_YJERK // Must be same as XY for delta
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -636,9 +636,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -636,9 +636,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -629,9 +629,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -648,9 +648,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK DEFAULT_XJERK
|
||||||
#define DEFAULT_ZJERK 20.0
|
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
|
||||||
#define DEFAULT_EJERK 20.0
|
#define DEFAULT_EJERK 20.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -579,8 +579,8 @@
|
||||||
* 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 17.0
|
#define DEFAULT_XJERK 8.5
|
||||||
#define DEFAULT_YJERK 17.0
|
#define DEFAULT_YJERK 8.5
|
||||||
#define DEFAULT_ZJERK 1.0
|
#define DEFAULT_ZJERK 1.0
|
||||||
#define DEFAULT_EJERK 4.0
|
#define DEFAULT_EJERK 4.0
|
||||||
|
|
||||||
|
|
|
@ -569,9 +569,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -561,9 +561,9 @@
|
||||||
* 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
|
#define DEFAULT_XJERK 10.0
|
||||||
#define DEFAULT_YJERK 20.0
|
#define DEFAULT_YJERK 10.0
|
||||||
#define DEFAULT_ZJERK 0.4
|
#define DEFAULT_ZJERK 0.3
|
||||||
#define DEFAULT_EJERK 5.0
|
#define DEFAULT_EJERK 5.0
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -397,8 +397,8 @@ void Stepper::isr() {
|
||||||
else {
|
else {
|
||||||
planner.discard_current_block();
|
planner.discard_current_block();
|
||||||
--cleaning_buffer_counter; // Count down for abort print
|
--cleaning_buffer_counter; // Count down for abort print
|
||||||
#ifdef SD_FINISHED_RELEASECOMMAND
|
#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
|
||||||
if (!cleaning_buffer_counter && (SD_FINISHED_STEPPERRELEASE)) enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
|
if (!cleaning_buffer_counter) enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
current_block = NULL; // Prep to get a new block after cleaning
|
current_block = NULL; // Prep to get a new block after cleaning
|
||||||
|
|
|
@ -896,8 +896,9 @@ void CardReader::printingHasFinished() {
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
sdprinting = false;
|
sdprinting = false;
|
||||||
if (SD_FINISHED_STEPPERRELEASE)
|
#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
|
||||||
enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
|
stepper.cleaning_buffer_counter = 1; // The command will fire from the Stepper ISR
|
||||||
|
#endif
|
||||||
print_job_timer.stop();
|
print_job_timer.stop();
|
||||||
if (print_job_timer.duration() > 60)
|
if (print_job_timer.duration() > 60)
|
||||||
enqueue_and_echo_commands_P(PSTR("M31"));
|
enqueue_and_echo_commands_P(PSTR("M31"));
|
||||||
|
|
Loading…
Reference in a new issue