Browse Source

MIN_SEGMENTS_FOR_MOVE => MIN_STEPS_PER_SEGMENT

Follow-up to #4666
Scott Lahteine 8 years ago
parent
commit
ab59280075

+ 2
- 2
Marlin/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/SanityCheck.h View File

@@ -133,8 +133,8 @@
133 133
   #error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_PROBE_DEPLOY_HEIGHT instead."
134 134
 #elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS)
135 135
   #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."
136
-#elif !defined(MIN_SEGMENTS_FOR_MOVE)
137
-  #error "\"dropsegments\" is replaced with MIN_SEGMENTS_FOR_MOVE (and increases by 1). Please update Configuration_adv.h."
136
+#elif !defined(MIN_STEPS_PER_SEGMENT)
137
+  #error "\"dropsegments\" is replaced with MIN_STEPS_PER_SEGMENT (and increases by 1). Please update Configuration_adv.h."
138 138
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
139 139
   #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
140 140
 #endif

+ 2
- 2
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/Felix/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/Hephestos_2/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/K8200/Configuration_adv.h View File

@@ -536,8 +536,8 @@
536 536
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
537 537
 //#define BEZIER_CURVE_SUPPORT
538 538
 
539
-// Moves with fewer segments than this will be ignored and joined with the next movement
540
-#define MIN_SEGMENTS_FOR_MOVE 3
539
+// Moves (or segments) with fewer steps than this will be joined with the next move
540
+#define MIN_STEPS_PER_SEGMENT 3
541 541
 
542 542
 // @section temperature
543 543
 

+ 2
- 2
Marlin/example_configurations/K8400/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/SCARA/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

@@ -538,8 +538,8 @@
538 538
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
539 539
 //#define BEZIER_CURVE_SUPPORT
540 540
 
541
-// Moves with fewer segments than this will be ignored and joined with the next movement
542
-#define MIN_SEGMENTS_FOR_MOVE 6
541
+// Moves (or segments) with fewer steps than this will be joined with the next move
542
+#define MIN_STEPS_PER_SEGMENT 6
543 543
 
544 544
 // @section temperature
545 545
 

+ 2
- 2
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

@@ -532,8 +532,8 @@
532 532
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
533 533
 //#define BEZIER_CURVE_SUPPORT
534 534
 
535
-// Moves with fewer segments than this will be ignored and joined with the next movement
536
-#define MIN_SEGMENTS_FOR_MOVE 6
535
+// Moves (or segments) with fewer steps than this will be joined with the next move
536
+#define MIN_STEPS_PER_SEGMENT 6
537 537
 
538 538
 // @section temperature
539 539
 

+ 2
- 2
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

@@ -532,8 +532,8 @@
532 532
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
533 533
 //#define BEZIER_CURVE_SUPPORT
534 534
 
535
-// Moves with fewer segments than this will be ignored and joined with the next movement
536
-#define MIN_SEGMENTS_FOR_MOVE 6
535
+// Moves (or segments) with fewer steps than this will be joined with the next move
536
+#define MIN_STEPS_PER_SEGMENT 6
537 537
 
538 538
 // @section temperature
539 539
 

+ 2
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

@@ -531,8 +531,8 @@
531 531
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
532 532
 //#define BEZIER_CURVE_SUPPORT
533 533
 
534
-// Moves with fewer segments than this will be ignored and joined with the next movement
535
-#define MIN_SEGMENTS_FOR_MOVE 6
534
+// Moves (or segments) with fewer steps than this will be joined with the next move
535
+#define MIN_STEPS_PER_SEGMENT 6
536 536
 
537 537
 // @section temperature
538 538
 

+ 2
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

@@ -536,8 +536,8 @@
536 536
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
537 537
 //#define BEZIER_CURVE_SUPPORT
538 538
 
539
-// Moves with fewer segments than this will be ignored and joined with the next movement
540
-#define MIN_SEGMENTS_FOR_MOVE 6
539
+// Moves (or segments) with fewer steps than this will be joined with the next move
540
+#define MIN_STEPS_PER_SEGMENT 6
541 541
 
542 542
 // @section temperature
543 543
 

+ 2
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h View File

@@ -532,8 +532,8 @@
532 532
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
533 533
 //#define BEZIER_CURVE_SUPPORT
534 534
 
535
-// Moves with fewer segments than this will be ignored and joined with the next movement
536
-#define MIN_SEGMENTS_FOR_MOVE 6
535
+// Moves (or segments) with fewer steps than this will be joined with the next move
536
+#define MIN_STEPS_PER_SEGMENT 6
537 537
 
538 538
 // @section temperature
539 539
 

+ 2
- 2
Marlin/example_configurations/makibox/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

@@ -530,8 +530,8 @@
530 530
 // Support for G5 with XYZE destination and IJPQ offsets. Requires ~2666 bytes.
531 531
 //#define BEZIER_CURVE_SUPPORT
532 532
 
533
-// Moves with fewer segments than this will be ignored and joined with the next movement
534
-#define MIN_SEGMENTS_FOR_MOVE 6
533
+// Moves (or segments) with fewer steps than this will be joined with the next move
534
+#define MIN_STEPS_PER_SEGMENT 6
535 535
 
536 536
 // @section temperature
537 537
 

+ 2
- 2
Marlin/planner.cpp View File

@@ -626,7 +626,7 @@ void Planner::check_axes_activity() {
626 626
   block->step_event_count = MAX4(block->steps[X_AXIS], block->steps[Y_AXIS], block->steps[Z_AXIS], block->steps[E_AXIS]);
627 627
 
628 628
   // Bail if this is a zero-length block
629
-  if (block->step_event_count < MIN_SEGMENTS_FOR_MOVE) return;
629
+  if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return;
630 630
 
631 631
   // For a mixing extruder, get a magnified step_event_count for each
632 632
   #if ENABLED(MIXING_EXTRUDER)
@@ -808,7 +808,7 @@ void Planner::check_axes_activity() {
808 808
   #endif
809 809
   delta_mm[E_AXIS] = 0.01 * (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * flow_percentage[extruder];
810 810
 
811
-  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) {
811
+  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) {
812 812
     block->millimeters = fabs(delta_mm[E_AXIS]);
813 813
   }
814 814
   else {

Loading…
Cancel
Save