Bläddra i källkod

Only call mesh_buffer_line when MBL is active

Scott Lahteine 8 år sedan
förälder
incheckning
f4a69281fc
1 ändrade filer med 6 tillägg och 9 borttagningar
  1. 6
    9
      Marlin/Marlin_main.cpp

+ 6
- 9
Marlin/Marlin_main.cpp Visa fil

@@ -7842,11 +7842,6 @@ void clamp_to_software_endstops(float target[3]) {
7842 7842
 
7843 7843
 // This function is used to split lines on mesh borders so each segment is only part of one mesh area
7844 7844
 void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, const uint8_t& extruder, uint8_t x_splits = 0xff, uint8_t y_splits = 0xff) {
7845
-  if (!mbl.active()) {
7846
-    planner.buffer_line(x, y, z, e, fr_mm_s, extruder);
7847
-    set_current_to_destination();
7848
-    return;
7849
-  }
7850 7845
   int pcx = mbl.cell_index_x(RAW_CURRENT_POSITION(X_AXIS)),
7851 7846
       pcy = mbl.cell_index_y(RAW_CURRENT_POSITION(Y_AXIS)),
7852 7847
       cx = mbl.cell_index_x(RAW_POSITION(x, X_AXIS)),
@@ -8007,11 +8002,13 @@ void mesh_buffer_line(float x, float y, float z, const float e, float fr_mm_s, c
8007 8002
     }
8008 8003
     else {
8009 8004
       #if ENABLED(MESH_BED_LEVELING)
8010
-        mesh_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], MMM_TO_MMS_SCALED(feedrate_mm_m), active_extruder);
8011
-        return false;
8012
-      #else
8013
-        line_to_destination(MMM_SCALED(feedrate_mm_m));
8005
+        if (mbl.active()) {
8006
+          mesh_buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], MMM_TO_MMS_SCALED(feedrate_mm_m), active_extruder);
8007
+          return false;
8008
+        }
8009
+        else
8014 8010
       #endif
8011
+          line_to_destination(MMM_SCALED(feedrate_mm_m));
8015 8012
     }
8016 8013
     return true;
8017 8014
   }

Laddar…
Avbryt
Spara