Ver código fonte

nz and ne are always set, so drop them down

Scott Lahteine 9 anos atrás
pai
commit
f6a3a1da09
1 arquivos alterados com 4 adições e 4 exclusões
  1. 4
    4
      Marlin/Marlin_main.cpp

+ 4
- 4
Marlin/Marlin_main.cpp Ver arquivo

@@ -7864,16 +7864,12 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c
7864 7864
     nx = mbl.get_probe_x(gcx) + home_offset[X_AXIS] + position_shift[X_AXIS];
7865 7865
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7866 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 7867
     CBI(x_splits, gcx);
7870 7868
   }
7871 7869
   else if (cy2 != cy1 && TEST(y_splits, gcy)) {
7872 7870
     ny = mbl.get_probe_y(gcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS];
7873 7871
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7874 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 7873
     CBI(y_splits, gcy);
7878 7874
   }
7879 7875
   else {
@@ -7882,6 +7878,10 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c
7882 7878
     set_current_to_destination();
7883 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 7885
   // Do the split and look for more borders
7886 7886
   destination[X_AXIS] = nx;
7887 7887
   destination[Y_AXIS] = ny;

Carregando…
Cancelar
Salvar