Browse Source

Undo errant optimization of block->millimeters

Scott Lahteine 9 years ago
parent
commit
83e1d90ca3
1 changed files with 4 additions and 16 deletions
  1. 4
    16
      Marlin/planner.cpp

+ 4
- 16
Marlin/planner.cpp View File

@@ -804,15 +804,9 @@ void Planner::check_axes_activity() {
804 804
     #endif
805 805
   #else
806 806
     float delta_mm[4];
807
-    #if ENABLED(DELTA)
808
-      // On delta all axes (should!) have the same steps-per-mm
809
-      // so calculate distance in steps first, then do one division
810
-      // at the end to get millimeters
811
-    #else
812
-      delta_mm[X_AXIS] = dx * steps_to_mm[X_AXIS];
813
-      delta_mm[Y_AXIS] = dy * steps_to_mm[Y_AXIS];
814
-      delta_mm[Z_AXIS] = dz * steps_to_mm[Z_AXIS];
815
-    #endif
807
+    delta_mm[X_AXIS] = dx * steps_to_mm[X_AXIS];
808
+    delta_mm[Y_AXIS] = dy * steps_to_mm[Y_AXIS];
809
+    delta_mm[Z_AXIS] = dz * steps_to_mm[Z_AXIS];
816 810
   #endif
817 811
   delta_mm[E_AXIS] = 0.01 * (de * steps_to_mm[E_AXIS]) * volumetric_multiplier[extruder] * extruder_multiplier[extruder];
818 812
 
@@ -827,16 +821,10 @@ void Planner::check_axes_activity() {
827 821
         sq(delta_mm[X_HEAD]) + sq(delta_mm[Y_AXIS]) + sq(delta_mm[Z_HEAD])
828 822
       #elif ENABLED(COREYZ)
829 823
         sq(delta_mm[X_AXIS]) + sq(delta_mm[Y_HEAD]) + sq(delta_mm[Z_HEAD])
830
-      #elif ENABLED(DELTA)
831
-        sq(dx) + sq(dy) + sq(dz)
832 824
       #else
833 825
         sq(delta_mm[X_AXIS]) + sq(delta_mm[Y_AXIS]) + sq(delta_mm[Z_AXIS])
834 826
       #endif
835
-    )
836
-      #if ENABLED(DELTA)
837
-        * steps_to_mm[X_AXIS]
838
-      #endif
839
-    ;
827
+    );
840 828
   }
841 829
   float inverse_millimeters = 1.0 / block->millimeters;  // Inverse millimeters to remove multiple divides
842 830
 

Loading…
Cancel
Save