Selaa lähdekoodia

nz and ne are always set, so drop them down

Scott Lahteine 9 vuotta sitten
vanhempi
commit
f6a3a1da09
1 muutettua tiedostoa jossa 4 lisäystä ja 4 poistoa
  1. 4
    4
      Marlin/Marlin_main.cpp

+ 4
- 4
Marlin/Marlin_main.cpp Näytä tiedosto

7864
     nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS];
7864
     nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS];
7865
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7865
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7866
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
7866
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
7867
-    nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7868
-    ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
7869
     CBI(x_splits, gcx);
7867
     CBI(x_splits, gcx);
7870
   }
7868
   }
7871
   else if (cy2 != cy1 && TEST(y_splits, gcy)) {
7869
   else if (cy2 != cy1 && TEST(y_splits, gcy)) {
7872
     ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS];
7870
     ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS];
7873
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7871
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7874
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
7872
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
7875
-    nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7876
-    ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
7877
     CBI(y_splits, gcy);
7873
     CBI(y_splits, gcy);
7878
   }
7874
   }
7879
   else {
7875
   else {
7882
     set_current_to_destination();
7878
     set_current_to_destination();
7883
     return;
7879
     return;
7884
   }
7880
   }
7881
+
7882
+  nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7883
+  ne = current_position[E_AXIS] + (e - current_position[E_AXIS]) * normalized_dist;
7884
+
7885
   // Do the split and look for more borders
7885
   // Do the split and look for more borders
7886
   destination[X_AXIS] = nx;
7886
   destination[X_AXIS] = nx;
7887
   destination[Y_AXIS] = ny;
7887
   destination[Y_AXIS] = ny;

Loading…
Peruuta
Tallenna