dropsegments => MIN_SEGMENTS_FOR_MOVE
This commit is contained in:
		
							parent
							
								
									4d4c00d69c
								
							
						
					
					
						commit
						374f8d2014
					
				@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -133,6 +133,8 @@
 | 
				
			|||||||
  #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_PROBE_DEPLOY_HEIGHT instead."
 | 
					  #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)
 | 
					#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."
 | 
					  #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."
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -536,7 +536,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 2; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 3
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -538,7 +538,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -532,7 +532,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -532,7 +532,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -531,7 +531,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -536,7 +536,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -532,7 +532,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @section temperature
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -530,7 +530,8 @@
 | 
				
			|||||||
// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
					// Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
 | 
				
			||||||
//#define BEZIER_CURVE_SUPPORT
 | 
					//#define BEZIER_CURVE_SUPPORT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const unsigned int dropsegments = 5; //everything with less than this number of steps will be ignored as move and joined with the next movement
 | 
					// Moves with fewer segments than this will be ignored and joined with the next movement
 | 
				
			||||||
 | 
					#define MIN_SEGMENTS_FOR_MOVE 6
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// @section temperature
 | 
					// @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]);
 | 
					  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
 | 
					  // Bail if this is a zero-length block
 | 
				
			||||||
  if (block->step_event_count <= dropsegments) return;
 | 
					  if (block->step_event_count < MIN_SEGMENTS_FOR_MOVE) return;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // For a mixing extruder, get a magnified step_event_count for each
 | 
					  // For a mixing extruder, get a magnified step_event_count for each
 | 
				
			||||||
  #if ENABLED(MIXING_EXTRUDER)
 | 
					  #if ENABLED(MIXING_EXTRUDER)
 | 
				
			||||||
@ -808,7 +808,7 @@ void Planner::check_axes_activity() {
 | 
				
			|||||||
  #endif
 | 
					  #endif
 | 
				
			||||||
  delta_mm[E_AXIS] = 0.01 * (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * flow_percentage[extruder];
 | 
					  delta_mm[E_AXIS] = 0.01 * (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * flow_percentage[extruder];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (block->steps[X_AXIS] <= dropsegments && block->steps[Y_AXIS] <= dropsegments && block->steps[Z_AXIS] <= dropsegments) {
 | 
					  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) {
 | 
				
			||||||
    block->millimeters = fabs(delta_mm[E_AXIS]);
 | 
					    block->millimeters = fabs(delta_mm[E_AXIS]);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  else {
 | 
					  else {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user