parent
27b80b1dd1
commit
ab59280075
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue