Skip to content

Commit

Permalink
Reduce default jerk. XY by half. Z by 1/4
Browse files Browse the repository at this point in the history
  • Loading branch information
@thinkyhead
thinkyhead committed Dec 25, 2017
1 parent aa9cad0 commit 88c0688
Show file tree
Hide file tree
Showing 35 changed files with 89 additions and 98 deletions.
6 changes: 3 additions & 3 deletions Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
*/
#define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 10.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/AliExpress/CL-260/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
17 changes: 4 additions & 13 deletions Marlin/example_configurations/Anet/A6/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,21 +612,12 @@
* 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 20.0
//#define DEFAULT_ZJERK 0.4
//#define DEFAULT_EJERK 5.0

// ANET A6 Firmware V2.0 defaults (jerk):
// Vxy-jerk: 20, Vz-jerk: +000.30, Ve-jerk: 10
#define DEFAULT_XJERK 20.0
#define DEFAULT_YJERK 20.0
// Vxy-jerk: 10, Vz-jerk: +000.30, Ve-jerk: 5
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#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
#define DEFAULT_EJERK 5.0

//===========================================================================
//============================= Z Probe Options =============================
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/Anet/A8/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,8 @@
* 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 20.0
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/BQ/Hephestos/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
*/
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,9 +567,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 1.0

//===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/BQ/WITBOX/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
*/
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Cartesio/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@
*/
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/Creality/CR-10/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,8 @@
* 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 20.0
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 2.7
#define DEFAULT_EJERK 5.0

Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,9 +571,9 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
#define DEFAULT_XJERK 17.0
#define DEFAULT_YJERK 17.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 8.5
#define DEFAULT_YJERK 8.5
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 4.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/Geeetech/GT2560/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,9 +581,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/Infitary/i3-M508/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,9 +570,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
8 changes: 4 additions & 4 deletions Marlin/example_configurations/Malyan/M150/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,10 +586,10 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
#define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.40
#define DEFAULT_EJERK 5.0
#define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
//============================= Z Probe Options =============================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/Micromake/C1/basic/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,9 +570,9 @@
* 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 20.0
#define DEFAULT_ZJERK 20.0
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,9 +570,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
8 changes: 4 additions & 4 deletions Marlin/example_configurations/RigidBot/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,10 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
#define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 5.0
#define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
//============================= Z Probe Options =============================
Expand Down
8 changes: 4 additions & 4 deletions Marlin/example_configurations/SCARA/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,10 +578,10 @@
* When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously.
*/
#define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 3.0
#define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 3.0

//===========================================================================
//============================= Z Probe Options =============================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Sanguinololu/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@
*/
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/TinyBoy2/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,9 +617,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/Velleman/K8200/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,9 +595,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@
*/
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.5
#define DEFAULT_ZJERK 0.4
#define DEFAULT_EJERK 20.0

//===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@
*/
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 1.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@
* 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 20.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,9 +646,9 @@
* 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_XJERK 10.0
#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

//===========================================================================
Expand Down
4 changes: 2 additions & 2 deletions Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -646,9 +646,9 @@
* 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_XJERK 10.0
#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

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/delta/generic/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,9 @@
* 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 20.0
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,9 @@
* 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 20.0
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -629,9 +629,9 @@
* 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 20.0
#define DEFAULT_ZJERK 20.0 // Must be same as XY for delta
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#define DEFAULT_EJERK 5.0

//===========================================================================
Expand Down
6 changes: 3 additions & 3 deletions Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,9 @@
* 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 20.0
#define DEFAULT_ZJERK 20.0
#define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
#define DEFAULT_EJERK 20.0

//===========================================================================
Expand Down
Loading

0 comments on commit 88c0688

Please sign in to comment.