zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add TRAVEL_EXTRA_XYJERK option

Browse source 
See #16949

Co-Authored-By: josedpedroso <josedpedroso@users.noreply.github.com>
This commit is contained in:
Scott Lahteine 2020-02-26 06:39:29 -06:00
parent 0a7e7a6fa5
commit 02cce7d4b4
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

@ -784,6 +784,8 @@
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
//#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 //#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
#if ENABLED(LIMITED_JERK_EDITING) #if ENABLED(LIMITED_JERK_EDITING)
#define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits #define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits

11
Marlin/src/module/planner.cpp
View file

@ -2397,8 +2397,15 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
LOOP_XYZE(i) LOOP_XYZE(i)
#endif #endif
{ {
const float jerk = ABS(current_speed[i]), // cs : Starting from zero, change in speed for this axis const float jerk = ABS(current_speed[i]); // cs : Starting from zero, change in speed for this axis
maxj = max_jerk[i]; // mj : The max jerk setting for this axis
float maxj = max_jerk[i]; // mj : The max jerk setting for this axis
#ifdef TRAVEL_EXTRA_XYJERK
if ((TRAVEL_EXTRA_XYJERK) && !de <= 0 && (i == X_AXIS || i == Y_AXIS))
maxj += TRAVEL_EXTRA_XYJERK; // Extra jerk allowance for travel moves
#endif
if (jerk > maxj) { // cs > mj : New current speed too fast? if (jerk > maxj) { // cs > mj : New current speed too fast?
if (limited) { // limited already? if (limited) { // limited already?
const float mjerk = nominal_speed * maxj; // ns*mj const float mjerk = nominal_speed * maxj; // ns*mj