forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8888 from thinkyhead/bf1_reduce_jerk_default

Browse Source 
[1.1.x] Reduce default jerk
master
Scott Lahteine 6 years ago committed by GitHub
parent aa9cad0cc6 e47316c9d3
commit 1bb5791e64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
37 changed files with 94 additions and 102 deletions
Show Stats Download Patch File Download Diff File

6
Marlin/Configuration.h
Unescape View File

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

5
Marlin/cardreader.cpp
Unescape View File

@ -891,8 +891,9 @@ void CardReader::printingHasFinished() {
}
else {
sdprinting = false;
if (SD_FINISHED_STEPPERRELEASE)
enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
stepper.cleaning_buffer_counter = 1; // The command will fire from the Stepper ISR
#endif
print_job_timer.stop();
if (print_job_timer.duration() > 60)
enqueue_and_echo_commands_P(PSTR("M31"));

2
Marlin/example_configurations/AlephObjects/TAZ4/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/AliExpress/CL-260/Configuration.h
Unescape View File

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

17
Marlin/example_configurations/Anet/A6/Configuration.h
Unescape View File

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

4
Marlin/example_configurations/Anet/A8/Configuration.h
Unescape View File

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

2
Marlin/example_configurations/BQ/Hephestos/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/BQ/Hephestos_2/Configuration.h
Unescape View File

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

2
Marlin/example_configurations/BQ/WITBOX/Configuration.h
Unescape View File

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

2
Marlin/example_configurations/Cartesio/Configuration.h
Unescape View File

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

4
Marlin/example_configurations/Creality/CR-10/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/FolgerTech/i3-2020/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/Geeetech/GT2560/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/Infitary/i3-M508/Configuration.h
Unescape View File

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

8
Marlin/example_configurations/Malyan/M150/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/Micromake/C1/basic/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/Micromake/C1/enhanced/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

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

8
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

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

8
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

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

2
Marlin/example_configurations/Sanguinololu/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/TinyBoy2/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/Velleman/K8200/Configuration.h
Unescape View File

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

2
Marlin/example_configurations/Velleman/K8400/Dual-head/Configuration.h
Unescape View File

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

2
Marlin/example_configurations/Wanhao/Duplicator 6/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

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

4
Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration.h
Unescape View File

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

4
Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape View File

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

6
Marlin/example_configurations/gCreate/gMax1.5+/Configuration.h
Unescape View File

@ -579,9 +579,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 1.0
#define DEFAULT_XJERK 8.5
#define DEFAULT_YJERK 8.5
#define DEFAULT_ZJERK 0.7
#define DEFAULT_EJERK 4.0
//===========================================================================

6
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -569,9 +569,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
//===========================================================================

6
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -561,9 +561,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
//===========================================================================

2
Marlin/example_configurations/wt150/Configuration.h
Unescape View File

@ -573,7 +573,7 @@
*/
#define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4
#define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0
//===========================================================================

4
Marlin/stepper.cpp
Unescape View File

@ -436,8 +436,8 @@ void Stepper::isr() {
else {
planner.discard_current_block();
--cleaning_buffer_counter; // Count down for abort print
#ifdef SD_FINISHED_RELEASECOMMAND
if (!cleaning_buffer_counter && (SD_FINISHED_STEPPERRELEASE)) enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
#if ENABLED(SD_FINISHED_STEPPERRELEASE) && defined(SD_FINISHED_RELEASECOMMAND)
if (!cleaning_buffer_counter) enqueue_and_echo_commands_P(PSTR(SD_FINISHED_RELEASECOMMAND));
#endif
}
current_block = NULL; // Prep to get a new block after cleaning

Write Preview
Loading…
Cancel
Save