Browse Source

Include the position_shift when splitting mesh lines

Scott Lahteine 9 years ago
parent
commit
799a31cd30
1 changed files with 4 additions and 4 deletions
  1. 4
    4
      Marlin/Marlin_main.cpp

+ 4
- 4
Marlin/Marlin_main.cpp View File

7863
   }
7863
   }
7864
   float nx, ny, nz, ne, normalized_dist;
7864
   float nx, ny, nz, ne, normalized_dist;
7865
   if (cx > pcx && TEST(x_splits, cx)) {
7865
   if (cx > pcx && TEST(x_splits, cx)) {
7866
-    nx = mbl.get_probe_x(cx) + home_offset[X_AXIS];
7866
+    nx = mbl.get_probe_x(cx) + home_offset[X_AXIS] + position_shift[X_AXIS];
7867
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7867
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7868
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
7868
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
7869
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7869
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7871
     CBI(x_splits, cx);
7871
     CBI(x_splits, cx);
7872
   }
7872
   }
7873
   else if (cx < pcx && TEST(x_splits, pcx)) {
7873
   else if (cx < pcx && TEST(x_splits, pcx)) {
7874
-    nx = mbl.get_probe_x(pcx) + home_offset[X_AXIS];
7874
+    nx = mbl.get_probe_x(pcx) + home_offset[X_AXIS] + position_shift[X_AXIS];
7875
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7875
     normalized_dist = (nx - current_position[X_AXIS]) / (x - current_position[X_AXIS]);
7876
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
7876
     ny = current_position[Y_AXIS] + (y - current_position[Y_AXIS]) * normalized_dist;
7877
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7877
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7879
     CBI(x_splits, pcx);
7879
     CBI(x_splits, pcx);
7880
   }
7880
   }
7881
   else if (cy > pcy && TEST(y_splits, cy)) {
7881
   else if (cy > pcy && TEST(y_splits, cy)) {
7882
-    ny = mbl.get_probe_y(cy) + home_offset[Y_AXIS];
7882
+    ny = mbl.get_probe_y(cy) + home_offset[Y_AXIS] + position_shift[Y_AXIS];
7883
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7883
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7884
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
7884
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
7885
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7885
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7887
     CBI(y_splits, cy);
7887
     CBI(y_splits, cy);
7888
   }
7888
   }
7889
   else if (cy < pcy && TEST(y_splits, pcy)) {
7889
   else if (cy < pcy && TEST(y_splits, pcy)) {
7890
-    ny = mbl.get_probe_y(pcy) + home_offset[Y_AXIS];
7890
+    ny = mbl.get_probe_y(pcy) + home_offset[Y_AXIS] + position_shift[Y_AXIS];
7891
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7891
     normalized_dist = (ny - current_position[Y_AXIS]) / (y - current_position[Y_AXIS]);
7892
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
7892
     nx = current_position[X_AXIS] + (x - current_position[X_AXIS]) * normalized_dist;
7893
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;
7893
     nz = current_position[Z_AXIS] + (z - current_position[Z_AXIS]) * normalized_dist;

Loading…
Cancel
Save