SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8887 from thinkyhead/bf2_reduce_jerk_default

Browse source 
[2.0.x] Reduce default jerk. XY by half. Z by 1/4
This commit is contained in:
Scott Lahteine 2017-12-24 21:48:35 -06:00 committed by GitHub
commit f218eb0ddf
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 99 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/Configuration.h
View file

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

6
Marlin/src/config/default/Configuration.h
View file

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

6
Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
View file

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

15
Marlin/src/config/examples/Anet/A6/Configuration.h
View file

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

4
Marlin/src/config/examples/Anet/A8/Configuration.h
View file

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

6
Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
View file

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

6
Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
View file

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

4
Marlin/src/config/examples/Creality/CR-10/Configuration.h
View file

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

6
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View file

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

6
Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
View file

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

6
Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
View file

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

2
Marlin/src/config/examples/Malyan/M150/Configuration.h
View file

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

6
Marlin/src/config/examples/Malyan/M200/Configuration.h
View file

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

6
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
View file

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

6
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
View file

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

6
Marlin/src/config/examples/Mks/Sbase/Configuration.h
View file

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

6
Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
View file

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

2
Marlin/src/config/examples/RigidBot/Configuration.h
View file

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

6
Marlin/src/config/examples/TinyBoy2/Configuration.h
View file

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

6
Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
View file

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

6
Marlin/src/config/examples/Velleman/K8200/Configuration.h
View file

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

6
Marlin/src/config/examples/adafruit/ST7565/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

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

4
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

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

6
Marlin/src/config/examples/delta/generic/Configuration.h
View file

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

6
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

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

6
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

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

6
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

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

4
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
View file

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

6
Marlin/src/config/examples/makibox/Configuration.h
View file

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

6
Marlin/src/config/examples/tvrrug/Round2/Configuration.h
View file

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

4
Marlin/src/module/stepper.cpp
View file

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

5
Marlin/src/sd/cardreader.cpp
View file

@ -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"));