diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 682f45fdfa514392e89400b5ba3f06749366889d..3a47c1312b050f2ee33b9dcd8e4446e9f3d8ad3b 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index ad49dd0d4f8ef17ffd99b58f0cae9b8e1fd6c7f0..78645ea1165fa4e5e2af7f774c7d9dfc5b3a913f 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -133,8 +133,8 @@ #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_PROBE_DEPLOY_HEIGHT instead." #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS) #error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT Please update your configuration." -#elif !defined(MIN_SEGMENTS_FOR_MOVE) - #error "\"dropsegments\" is replaced with MIN_SEGMENTS_FOR_MOVE (and increases by 1). Please update Configuration_adv.h." +#elif !defined(MIN_STEPS_PER_SEGMENT) + #error "\"dropsegments\" is replaced with MIN_STEPS_PER_SEGMENT (and increases by 1). Please update Configuration_adv.h." #elif defined(PREVENT_DANGEROUS_EXTRUDE) #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration." #endif diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h index e33b05a6ee2ed213ca75b99aa8463cbf41ca4eba..dea88287553174635ccc210dcd58532811a15a1b 100644 --- a/Marlin/example_configurations/Cartesio/Configuration_adv.h +++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 72fc5b9e4694c7b0bcce21a7c96ce80b6034bccc..dc58b55893d4ed9847c7f5466a2c1ba0584726f2 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index bed4a8b9b36db23d4907bf8efc45381f9453bab6..9f252d4a2a1ee705c9254083a20651f428124630 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h index 199978be2e6190ec123e0a5464c0b08acb65b823..06ba9b25514bf9ba1bd7755f1710f9d8d9a8d400 100644 --- a/Marlin/example_configurations/Hephestos_2/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos_2/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 34578bd29b2925b36160cd02b47741ed179cde55..4c870b17d6f26d8743ffffafd3b2ed0c06bf72a3 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -536,8 +536,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 3 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 3 // @section temperature diff --git a/Marlin/example_configurations/K8400/Configuration_adv.h b/Marlin/example_configurations/K8400/Configuration_adv.h index 35d48efcec9ce782f03c1b0f2bdb85b7c0f5825d..444f87234494da61a147277d69d242601eebc86a 100644 --- a/Marlin/example_configurations/K8400/Configuration_adv.h +++ b/Marlin/example_configurations/K8400/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 439c1d6eca0ebd068bbf62fa086c49531e0fd235..308b3ef0d290610c04696bc4725b2352cd7342a8 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index f81d34750d83ee291b1332270366ce89070c6d27..108c9822446d5d0df1fea1d04e7408560bf04948 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/TAZ4/Configuration_adv.h b/Marlin/example_configurations/TAZ4/Configuration_adv.h index 57bae4d87f7f2105e2ab6a1c9c1cc19113207375..60141729126212390b26ad7a2b927e0d2780db62 100644 --- a/Marlin/example_configurations/TAZ4/Configuration_adv.h +++ b/Marlin/example_configurations/TAZ4/Configuration_adv.h @@ -538,8 +538,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index bed4a8b9b36db23d4907bf8efc45381f9453bab6..9f252d4a2a1ee705c9254083a20651f428124630 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index ff0ef5c9855d0631977d128a97f402b64856c0f8..62a8b14c9980d5bd26b7f865d1e0a64caf197cf5 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -532,8 +532,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index 9ad068722e725bfcb3967013ed3f6ce53b96fedf..1981148abcb2a18b4deaa9c0e8d97eb8e3b098c8 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -532,8 +532,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 374d39c8dded383fe9506083201dec3e636b3b45..5dab25a92ac351b04faa2041c283ef3de13c5c15 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -531,8 +531,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 616639f2c807e06d3a9dced2125a41d238d75ec1..30b3f4e8eee1d31ba0bc93f66aa62ea73be71fb9 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -536,8 +536,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h index e1b66ca5aecbfa4b301f762ef2f0178eb1e747ec..e509fb3982c736b8927d8735da330b776a6257bd 100644 --- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h @@ -532,8 +532,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 4c3a3e11bcb65e5e422ef0304d0abcad8a5d44af..767adf6c0571607091fef033fc8ce34dbe932559 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index a7b04097b05b4e78f6d9503fc27d503b2f4bf6ff..e4c212fe950dedd25583d4eb980e02265f53a2c4 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -530,8 +530,8 @@ // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes. //#define BEZIER_CURVE_SUPPORT -// Moves with fewer segments than this will be ignored and joined with the next movement -#define MIN_SEGMENTS_FOR_MOVE 6 +// Moves (or segments) with fewer steps than this will be joined with the next move +#define MIN_STEPS_PER_SEGMENT 6 // @section temperature diff --git a/Marlin/planner.cpp b/Marlin/planner.cpp index d0f2d4c9afee3fc0f3d62aa197856dd1b69e84d0..4fd18f5a2b3560a45b9c578a44236a836ae9e409 100644 --- a/Marlin/planner.cpp +++ b/Marlin/planner.cpp @@ -626,7 +626,7 @@ void Planner::check_axes_activity() { block->step_event_count = MAX4(block->steps[X_AXIS], block->steps[Y_AXIS], block->steps[Z_AXIS], block->steps[E_AXIS]); // Bail if this is a zero-length block - if (block->step_event_count < MIN_SEGMENTS_FOR_MOVE) return; + if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return; // For a mixing extruder, get a magnified step_event_count for each #if ENABLED(MIXING_EXTRUDER) @@ -808,7 +808,7 @@ void Planner::check_axes_activity() { #endif delta_mm[E_AXIS] = 0.01 * (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * flow_percentage[extruder]; - if (block->steps[X_AXIS] < MIN_SEGMENTS_FOR_MOVE && block->steps[Y_AXIS] < MIN_SEGMENTS_FOR_MOVE && block->steps[Z_AXIS] < MIN_SEGMENTS_FOR_MOVE) { + if (block->steps[X_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[Y_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[Z_AXIS] < MIN_STEPS_PER_SEGMENT) { block->millimeters = fabs(delta_mm[E_AXIS]); } else {