Browse Source

feed_factor => inverse_secs

Scott Lahteine 7 years ago
parent
commit
81c0a918af
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/src/module/motion.cpp

+ 3
- 3
Marlin/src/module/motion.cpp View File

@@ -578,7 +578,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
578 578
     #if IS_SCARA && ENABLED(SCARA_FEEDRATE_SCALING)
579 579
       // SCARA needs to scale the feed rate from mm/s to degrees/s
580 580
       const float inv_segment_length = min(10.0, float(segments) / cartesian_mm), // 1/mm/segs
581
-                  feed_factor = inv_segment_length * _feedrate_mm_s;
581
+                  inverse_secs = inv_segment_length * _feedrate_mm_s;
582 582
       float oldA = stepper.get_axis_position_degrees(A_AXIS),
583 583
             oldB = stepper.get_axis_position_degrees(B_AXIS);
584 584
     #endif
@@ -612,7 +612,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
612 612
         // Use ratio between the length of the move and the larger angle change
613 613
         const float adiff = abs(delta[A_AXIS] - oldA),
614 614
                     bdiff = abs(delta[B_AXIS] - oldB);
615
-        planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * feed_factor, active_extruder);
615
+        planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * inverse_secs, active_extruder);
616 616
         oldA = delta[A_AXIS];
617 617
         oldB = delta[B_AXIS];
618 618
       #else
@@ -630,7 +630,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
630 630
       ADJUST_DELTA(rtarget);
631 631
       const float adiff = abs(delta[A_AXIS] - oldA),
632 632
                   bdiff = abs(delta[B_AXIS] - oldB);
633
-      planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * feed_factor, active_extruder);
633
+      planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], max(adiff, bdiff) * inverse_secs, active_extruder);
634 634
     #else
635 635
       planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder);
636 636
     #endif

Loading…
Cancel
Save