Procházet zdrojové kódy

Allow non-square leveling grid

Scott Lahteine před 8 roky
rodič
revize
e5505e3b33
24 změnil soubory, kde provedl 94 přidání a 65 odebrání
  1. 2
    1
      Marlin/Configuration.h
  2. 39
    34
      Marlin/Marlin_main.cpp
  3. 6
    4
      Marlin/SanityCheck.h
  4. 2
    1
      Marlin/example_configurations/Cartesio/Configuration.h
  5. 2
    1
      Marlin/example_configurations/Felix/Configuration.h
  6. 2
    1
      Marlin/example_configurations/Felix/DUAL/Configuration.h
  7. 2
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  8. 2
    1
      Marlin/example_configurations/Hephestos_2/Configuration.h
  9. 2
    1
      Marlin/example_configurations/K8200/Configuration.h
  10. 2
    1
      Marlin/example_configurations/K8400/Configuration.h
  11. 2
    1
      Marlin/example_configurations/K8400/Dual-head/Configuration.h
  12. 2
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  13. 2
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  14. 2
    1
      Marlin/example_configurations/SCARA/Configuration.h
  15. 2
    1
      Marlin/example_configurations/TAZ4/Configuration.h
  16. 2
    1
      Marlin/example_configurations/WITBOX/Configuration.h
  17. 2
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  18. 3
    2
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  19. 3
    2
      Marlin/example_configurations/delta/generic/Configuration.h
  20. 3
    2
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  21. 3
    2
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  22. 3
    2
      Marlin/example_configurations/delta/kossel_xl/Configuration.h
  23. 2
    1
      Marlin/example_configurations/makibox/Configuration.h
  24. 2
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 2
- 1
Marlin/Configuration.h Zobrazit soubor

@@ -768,7 +768,8 @@
768 768
 
769 769
     // Set the number of grid points per dimension.
770 770
     // You probably don't need more than 3 (squared=9).
771
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
771
+    #define ABL_GRID_POINTS_X 3
772
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
772 773
 
773 774
   #else  // !AUTO_BED_LEVELING_GRID
774 775
 

+ 39
- 34
Marlin/Marlin_main.cpp Zobrazit soubor

@@ -494,7 +494,7 @@ static uint8_t target_extruder;
494 494
 
495 495
 #if ENABLED(AUTO_BED_LEVELING_NONLINEAR)
496 496
   int nonlinear_grid_spacing[2] = { 0 };
497
-  float bed_level_grid[AUTO_BED_LEVELING_GRID_POINTS][AUTO_BED_LEVELING_GRID_POINTS];
497
+  float bed_level_grid[ABL_GRID_POINTS_X][ABL_GRID_POINTS_Y];
498 498
 #endif
499 499
 
500 500
 #if IS_SCARA
@@ -2122,14 +2122,15 @@ static void clean_up_after_endstop_or_probe_move() {
2122 2122
    * using linear extrapolation, away from the center.
2123 2123
    */
2124 2124
   static void extrapolate_unprobed_bed_level() {
2125
-    uint8_t half = (AUTO_BED_LEVELING_GRID_POINTS - 1) / 2;
2126
-    for (uint8_t y = 0; y <= half; y++) {
2127
-      for (uint8_t x = 0; x <= half; x++) {
2125
+    int half_x = (ABL_GRID_POINTS_X - 1) / 2,
2126
+        half_y = (ABL_GRID_POINTS_Y - 1) / 2;
2127
+    for (uint8_t y = 0; y <= half_y; y++) {
2128
+      for (uint8_t x = 0; x <= half_x; x++) {
2128 2129
         if (x + y < 3) continue;
2129
-        extrapolate_one_point(half - x, half - y, x > 1 ? +1 : 0, y > 1 ? +1 : 0);
2130
-        extrapolate_one_point(half + x, half - y, x > 1 ? -1 : 0, y > 1 ? +1 : 0);
2131
-        extrapolate_one_point(half - x, half + y, x > 1 ? +1 : 0, y > 1 ? -1 : 0);
2132
-        extrapolate_one_point(half + x, half + y, x > 1 ? -1 : 0, y > 1 ? -1 : 0);
2130
+        extrapolate_one_point(half_x - x, half_y - y, x > 1 ? +1 : 0, y > 1 ? +1 : 0);
2131
+        extrapolate_one_point(half_x + x, half_y - y, x > 1 ? -1 : 0, y > 1 ? +1 : 0);
2132
+        extrapolate_one_point(half_x - x, half_y + y, x > 1 ? +1 : 0, y > 1 ? -1 : 0);
2133
+        extrapolate_one_point(half_x + x, half_y + y, x > 1 ? -1 : 0, y > 1 ? -1 : 0);
2133 2134
       }
2134 2135
     }
2135 2136
   }
@@ -2138,8 +2139,8 @@ static void clean_up_after_endstop_or_probe_move() {
2138 2139
    * Print calibration results for plotting or manual frame adjustment.
2139 2140
    */
2140 2141
   static void print_bed_level() {
2141
-    for (uint8_t y = 0; y < AUTO_BED_LEVELING_GRID_POINTS; y++) {
2142
-      for (uint8_t x = 0; x < AUTO_BED_LEVELING_GRID_POINTS; x++) {
2142
+    for (uint8_t y = 0; y < ABL_GRID_POINTS_Y; y++) {
2143
+      for (uint8_t x = 0; x < ABL_GRID_POINTS_X; x++) {
2143 2144
         SERIAL_PROTOCOL_F(bed_level_grid[x][y], 2);
2144 2145
         SERIAL_PROTOCOLCHAR(' ');
2145 2146
       }
@@ -3308,11 +3309,12 @@ inline void gcode_G28() {
3308 3309
         if (dryrun) SERIAL_PROTOCOLLNPGM("Running in DRY-RUN mode");
3309 3310
       }
3310 3311
 
3311
-      int auto_bed_leveling_grid_points = AUTO_BED_LEVELING_GRID_POINTS;
3312
+      int abl_grid_points_x = ABL_GRID_POINTS_X,
3313
+          abl_grid_points_y = ABL_GRID_POINTS_Y;
3312 3314
 
3313 3315
       #if ENABLED(AUTO_BED_LEVELING_LINEAR)
3314
-        if (code_seen('P')) auto_bed_leveling_grid_points = code_value_int();
3315
-        if (auto_bed_leveling_grid_points < 2) {
3316
+        if (code_seen('P')) abl_grid_points_x = abl_grid_points_y = code_value_int();
3317
+        if (abl_grid_points_x < 2) {
3316 3318
           SERIAL_PROTOCOLLNPGM("?Number of probed (P)oints is implausible (2 minimum).");
3317 3319
           return;
3318 3320
         }
@@ -3400,8 +3402,8 @@ inline void gcode_G28() {
3400 3402
     #if ENABLED(AUTO_BED_LEVELING_GRID)
3401 3403
 
3402 3404
       // probe at the points of a lattice grid
3403
-      const float xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (auto_bed_leveling_grid_points - 1),
3404
-                  yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (auto_bed_leveling_grid_points - 1);
3405
+      const float xGridSpacing = (right_probe_bed_position - left_probe_bed_position) / (abl_grid_points_x - 1),
3406
+                  yGridSpacing = (back_probe_bed_position - front_probe_bed_position) / (abl_grid_points_y - 1);
3405 3407
 
3406 3408
       #if ENABLED(AUTO_BED_LEVELING_NONLINEAR)
3407 3409
 
@@ -3421,30 +3423,31 @@ inline void gcode_G28() {
3421 3423
          * so Vx = -a Vy = -b Vz = 1 (we want the vector facing towards positive Z
3422 3424
          */
3423 3425
 
3424
-        int abl2 = sq(auto_bed_leveling_grid_points);
3426
+        int abl2 = abl_grid_points_x * abl_grid_points_y;
3425 3427
 
3426 3428
         double eqnAMatrix[abl2 * 3], // "A" matrix of the linear system of equations
3427 3429
                eqnBVector[abl2],     // "B" vector of Z points
3428 3430
                mean = 0.0;
3429
-        int8_t indexIntoAB[auto_bed_leveling_grid_points][auto_bed_leveling_grid_points];
3431
+        int indexIntoAB[abl_grid_points_x][abl_grid_points_y];
3430 3432
 
3431 3433
       #endif // AUTO_BED_LEVELING_LINEAR
3432 3434
 
3433 3435
       int probePointCounter = 0;
3434
-      bool zig = auto_bed_leveling_grid_points & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
3436
+      bool zig = abl_grid_points_y & 1; //always end at [RIGHT_PROBE_BED_POSITION, BACK_PROBE_BED_POSITION]
3435 3437
 
3436
-      for (uint8_t yCount = 0; yCount < auto_bed_leveling_grid_points; yCount++) {
3438
+      for (uint8_t yCount = 0; yCount < abl_grid_points_y; yCount++) {
3437 3439
         float yBase = front_probe_bed_position + yGridSpacing * yCount;
3438 3440
         yProbe = floor(yBase + (yBase < 0 ? 0 : 0.5));
3441
+
3439 3442
         int8_t xStart, xStop, xInc;
3440 3443
 
3441 3444
         if (zig) {
3442 3445
           xStart = 0;
3443
-          xStop = auto_bed_leveling_grid_points;
3446
+          xStop = abl_grid_points_x;
3444 3447
           xInc = 1;
3445 3448
         }
3446 3449
         else {
3447
-          xStart = auto_bed_leveling_grid_points - 1;
3450
+          xStart = abl_grid_points_x - 1;
3448 3451
           xStop = -1;
3449 3452
           xInc = -1;
3450 3453
         }
@@ -3579,8 +3582,8 @@ inline void gcode_G28() {
3579 3582
 
3580 3583
         float min_diff = 999;
3581 3584
 
3582
-        for (int8_t yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
3583
-          for (uint8_t xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
3585
+        for (int8_t yy = abl_grid_points_y - 1; yy >= 0; yy--) {
3586
+          for (uint8_t xx = 0; xx < abl_grid_points_x; xx++) {
3584 3587
             int ind = indexIntoAB[xx][yy];
3585 3588
             float diff = eqnBVector[ind] - mean,
3586 3589
                   x_tmp = eqnAMatrix[ind + 0 * abl2],
@@ -3604,8 +3607,8 @@ inline void gcode_G28() {
3604 3607
         if (verbose_level > 3) {
3605 3608
           SERIAL_PROTOCOLLNPGM("\nCorrected Bed Height vs. Bed Topology:");
3606 3609
 
3607
-          for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
3608
-            for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
3610
+          for (int8_t yy = abl_grid_points_y - 1; yy >= 0; yy--) {
3611
+            for (uint8_t xx = 0; xx < abl_grid_points_x; xx++) {
3609 3612
               int ind = indexIntoAB[xx][yy];
3610 3613
               float x_tmp = eqnAMatrix[ind + 0 * abl2],
3611 3614
                     y_tmp = eqnAMatrix[ind + 1 * abl2],
@@ -7796,16 +7799,18 @@ void ok_to_send() {
7796 7799
     void adjust_delta(float cartesian[XYZ]) {
7797 7800
       if (nonlinear_grid_spacing[X_AXIS] == 0 || nonlinear_grid_spacing[Y_AXIS] == 0) return; // G29 not done!
7798 7801
 
7799
-      int half = (AUTO_BED_LEVELING_GRID_POINTS - 1) / 2;
7800
-      float h1 = 0.001 - half, h2 = half - 0.001,
7801
-            grid_x = max(h1, min(h2, RAW_X_POSITION(cartesian[X_AXIS]) / nonlinear_grid_spacing[X_AXIS])),
7802
-            grid_y = max(h1, min(h2, RAW_Y_POSITION(cartesian[Y_AXIS]) / nonlinear_grid_spacing[Y_AXIS]));
7803
-      int floor_x = floor(grid_x), floor_y = floor(grid_y);
7802
+      int half_x = (ABL_GRID_POINTS_X - 1) / 2,
7803
+          half_y = (ABL_GRID_POINTS_Y - 1) / 2;
7804
+      float hx2 = half_x - 0.001, hx1 = -hx2,
7805
+            hy2 = half_y - 0.001, hy1 = -hy2,
7806
+            grid_x = max(hx1, min(hx2, RAW_X_POSITION(cartesian[X_AXIS]) / nonlinear_grid_spacing[X_AXIS])),
7807
+            grid_y = max(hy1, min(hy2, RAW_Y_POSITION(cartesian[Y_AXIS]) / nonlinear_grid_spacing[Y_AXIS]));
7808
+      int   floor_x = floor(grid_x), floor_y = floor(grid_y);
7804 7809
       float ratio_x = grid_x - floor_x, ratio_y = grid_y - floor_y,
7805
-            z1 = bed_level_grid[floor_x + half][floor_y + half],
7806
-            z2 = bed_level_grid[floor_x + half][floor_y + half + 1],
7807
-            z3 = bed_level_grid[floor_x + half + 1][floor_y + half],
7808
-            z4 = bed_level_grid[floor_x + half + 1][floor_y + half + 1],
7810
+            z1 = bed_level_grid[floor_x + half_x][floor_y + half_y],
7811
+            z2 = bed_level_grid[floor_x + half_x][floor_y + half_y + 1],
7812
+            z3 = bed_level_grid[floor_x + half_x + 1][floor_y + half_y],
7813
+            z4 = bed_level_grid[floor_x + half_x + 1][floor_y + half_y + 1],
7809 7814
             left = (1 - ratio_y) * z1 + ratio_y * z2,
7810 7815
             right = (1 - ratio_y) * z3 + ratio_y * z4,
7811 7816
             offset = (1 - ratio_x) * left + ratio_x * right;

+ 6
- 4
Marlin/SanityCheck.h Zobrazit soubor

@@ -139,6 +139,8 @@
139 139
   #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
140 140
 #elif defined(SCARA)
141 141
   #error "SCARA is now MORGAN_SCARA. Please update your configuration."
142
+#elif defined(AUTO_BED_LEVELING_GRID_POINTS)
143
+  #error "AUTO_BED_LEVELING_GRID_POINTS is now ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y. Please update your configuration."
142 144
 #endif
143 145
 
144 146
 /**
@@ -196,10 +198,10 @@
196 198
     #error "You probably want to use Max Endstops for DELTA!"
197 199
   #endif
198 200
   #if ENABLED(AUTO_BED_LEVELING_GRID)
199
-    #if (AUTO_BED_LEVELING_GRID_POINTS & 1) == 0
200
-      #error "DELTA requires an odd value for AUTO_BED_LEVELING_GRID_POINTS."
201
-    #elif AUTO_BED_LEVELING_GRID_POINTS < 3
202
-      #error "DELTA requires at least 3 AUTO_BED_LEVELING_GRID_POINTS."
201
+    #if (ABL_GRID_POINTS_X & 1) == 0 || (ABL_GRID_POINTS_Y & 1) == 0
202
+      #error "DELTA requires ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y to be odd numbers."
203
+    #elif ABL_GRID_POINTS_X < 3
204
+      #error "DELTA requires ABL_GRID_POINTS_X and ABL_GRID_POINTS_Y to be 3 or higher."
203 205
     #endif
204 206
   #endif
205 207
 #endif

+ 2
- 1
Marlin/example_configurations/Cartesio/Configuration.h Zobrazit soubor

@@ -751,7 +751,8 @@
751 751
 
752 752
     // Set the number of grid points per dimension.
753 753
     // You probably don't need more than 3 (squared=9).
754
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
754
+    #define ABL_GRID_POINTS_X 3
755
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
755 756
 
756 757
   #else  // !AUTO_BED_LEVELING_GRID
757 758
 

+ 2
- 1
Marlin/example_configurations/Felix/Configuration.h Zobrazit soubor

@@ -734,7 +734,8 @@
734 734
 
735 735
     // Set the number of grid points per dimension.
736 736
     // You probably don't need more than 3 (squared=9).
737
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
737
+    #define ABL_GRID_POINTS_X 3
738
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
738 739
 
739 740
   #else  // !AUTO_BED_LEVELING_GRID
740 741
 

+ 2
- 1
Marlin/example_configurations/Felix/DUAL/Configuration.h Zobrazit soubor

@@ -732,7 +732,8 @@
732 732
 
733 733
     // Set the number of grid points per dimension.
734 734
     // You probably don't need more than 3 (squared=9).
735
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
735
+    #define ABL_GRID_POINTS_X 3
736
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
736 737
 
737 738
   #else  // !AUTO_BED_LEVELING_GRID
738 739
 

+ 2
- 1
Marlin/example_configurations/Hephestos/Configuration.h Zobrazit soubor

@@ -743,7 +743,8 @@
743 743
 
744 744
     // Set the number of grid points per dimension.
745 745
     // You probably don't need more than 3 (squared=9).
746
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
746
+    #define ABL_GRID_POINTS_X 3
747
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
747 748
 
748 749
   #else  // !AUTO_BED_LEVELING_GRID
749 750
 

+ 2
- 1
Marlin/example_configurations/Hephestos_2/Configuration.h Zobrazit soubor

@@ -745,7 +745,8 @@
745 745
 
746 746
     // Set the number of grid points per dimension.
747 747
     // You probably don't need more than 3 (squared=9).
748
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
748
+    #define ABL_GRID_POINTS_X 3
749
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
749 750
 
750 751
   #else  // !AUTO_BED_LEVELING_GRID
751 752
 

+ 2
- 1
Marlin/example_configurations/K8200/Configuration.h Zobrazit soubor

@@ -768,7 +768,8 @@
768 768
 
769 769
     // Set the number of grid points per dimension.
770 770
     // You probably don't need more than 3 (squared=9).
771
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
771
+    #define ABL_GRID_POINTS_X 3
772
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
772 773
 
773 774
   #else  // !AUTO_BED_LEVELING_GRID
774 775
 

+ 2
- 1
Marlin/example_configurations/K8400/Configuration.h Zobrazit soubor

@@ -751,7 +751,8 @@
751 751
 
752 752
     // Set the number of grid points per dimension.
753 753
     // You probably don't need more than 3 (squared=9).
754
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
754
+    #define ABL_GRID_POINTS_X 3
755
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
755 756
 
756 757
   #else  // !AUTO_BED_LEVELING_GRID
757 758
 

+ 2
- 1
Marlin/example_configurations/K8400/Dual-head/Configuration.h Zobrazit soubor

@@ -751,7 +751,8 @@
751 751
 
752 752
     // Set the number of grid points per dimension.
753 753
     // You probably don't need more than 3 (squared=9).
754
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
754
+    #define ABL_GRID_POINTS_X 3
755
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
755 756
 
756 757
   #else  // !AUTO_BED_LEVELING_GRID
757 758
 

+ 2
- 1
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Zobrazit soubor

@@ -751,7 +751,8 @@
751 751
 
752 752
     // Set the number of grid points per dimension.
753 753
     // You probably don't need more than 3 (squared=9).
754
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
754
+    #define ABL_GRID_POINTS_X 3
755
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
755 756
 
756 757
   #else  // !AUTO_BED_LEVELING_GRID
757 758
 

+ 2
- 1
Marlin/example_configurations/RigidBot/Configuration.h Zobrazit soubor

@@ -749,7 +749,8 @@
749 749
 
750 750
     // Set the number of grid points per dimension.
751 751
     // You probably don't need more than 3 (squared=9).
752
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
752
+    #define ABL_GRID_POINTS_X 3
753
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
753 754
 
754 755
   #else  // !AUTO_BED_LEVELING_GRID
755 756
 

+ 2
- 1
Marlin/example_configurations/SCARA/Configuration.h Zobrazit soubor

@@ -761,7 +761,8 @@
761 761
 
762 762
     // Set the number of grid points per dimension.
763 763
     // You probably don't need more than 3 (squared=9).
764
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
764
+    #define ABL_GRID_POINTS_X 3
765
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
765 766
 
766 767
   #else  // !AUTO_BED_LEVELING_GRID
767 768
 

+ 2
- 1
Marlin/example_configurations/TAZ4/Configuration.h Zobrazit soubor

@@ -772,7 +772,8 @@
772 772
 
773 773
     // Set the number of grid points per dimension.
774 774
     // You probably don't need more than 3 (squared=9).
775
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
775
+    #define ABL_GRID_POINTS_X 3
776
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
776 777
 
777 778
   #else  // !AUTO_BED_LEVELING_GRID
778 779
 

+ 2
- 1
Marlin/example_configurations/WITBOX/Configuration.h Zobrazit soubor

@@ -743,7 +743,8 @@
743 743
 
744 744
     // Set the number of grid points per dimension.
745 745
     // You probably don't need more than 3 (squared=9).
746
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
746
+    #define ABL_GRID_POINTS_X 3
747
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
747 748
 
748 749
   #else  // !AUTO_BED_LEVELING_GRID
749 750
 

+ 2
- 1
Marlin/example_configurations/adafruit/ST7565/Configuration.h Zobrazit soubor

@@ -751,7 +751,8 @@
751 751
 
752 752
     // Set the number of grid points per dimension.
753 753
     // You probably don't need more than 3 (squared=9).
754
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
754
+    #define ABL_GRID_POINTS_X 3
755
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
755 756
 
756 757
   #else  // !AUTO_BED_LEVELING_GRID
757 758
 

+ 3
- 2
Marlin/example_configurations/delta/biv2.5/Configuration.h Zobrazit soubor

@@ -844,8 +844,9 @@
844 844
     // Non-linear bed leveling will be used.
845 845
     // Compensate by interpolating between the nearest four Z probe values for each point.
846 846
     // Useful for deltas where the print surface may appear like a bowl or dome shape.
847
-    // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
848
-    #define AUTO_BED_LEVELING_GRID_POINTS 9
847
+    // Works best with 5 or more points in each dimension.
848
+    #define ABL_GRID_POINTS_X 9
849
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
849 850
 
850 851
   #else  // !AUTO_BED_LEVELING_GRID
851 852
 

+ 3
- 2
Marlin/example_configurations/delta/generic/Configuration.h Zobrazit soubor

@@ -838,8 +838,9 @@
838 838
     // Non-linear bed leveling will be used.
839 839
     // Compensate by interpolating between the nearest four Z probe values for each point.
840 840
     // Useful for deltas where the print surface may appear like a bowl or dome shape.
841
-    // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
842
-    #define AUTO_BED_LEVELING_GRID_POINTS 9
841
+    // Works best with 5 or more points in each dimension.
842
+    #define ABL_GRID_POINTS_X 9
843
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
843 844
 
844 845
   #else  // !AUTO_BED_LEVELING_GRID
845 846
 

+ 3
- 2
Marlin/example_configurations/delta/kossel_mini/Configuration.h Zobrazit soubor

@@ -841,8 +841,9 @@
841 841
     // Non-linear bed leveling will be used.
842 842
     // Compensate by interpolating between the nearest four Z probe values for each point.
843 843
     // Useful for deltas where the print surface may appear like a bowl or dome shape.
844
-    // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
845
-    #define AUTO_BED_LEVELING_GRID_POINTS 9
844
+    // Works best with 5 or more points in each dimension.
845
+    #define ABL_GRID_POINTS_X 9
846
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
846 847
 
847 848
   #else  // !AUTO_BED_LEVELING_GRID
848 849
 

+ 3
- 2
Marlin/example_configurations/delta/kossel_pro/Configuration.h Zobrazit soubor

@@ -842,8 +842,9 @@
842 842
     // Non-linear bed leveling will be used.
843 843
     // Compensate by interpolating between the nearest four Z probe values for each point.
844 844
     // Useful for deltas where the print surface may appear like a bowl or dome shape.
845
-    // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
846
-    #define AUTO_BED_LEVELING_GRID_POINTS 7
845
+    // Works best with 5 or more points in each dimension.
846
+    #define ABL_GRID_POINTS_X 7
847
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
847 848
 
848 849
   #else  // !AUTO_BED_LEVELING_GRID
849 850
 

+ 3
- 2
Marlin/example_configurations/delta/kossel_xl/Configuration.h Zobrazit soubor

@@ -844,8 +844,9 @@
844 844
     // Non-linear bed leveling will be used.
845 845
     // Compensate by interpolating between the nearest four Z probe values for each point.
846 846
     // Useful for deltas where the print surface may appear like a bowl or dome shape.
847
-    // Works best with AUTO_BED_LEVELING_GRID_POINTS 5 or higher.
848
-    #define AUTO_BED_LEVELING_GRID_POINTS 5
847
+    // Works best with 5 or more points in each dimension.
848
+    #define ABL_GRID_POINTS_X 5
849
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
849 850
 
850 851
   #else  // !AUTO_BED_LEVELING_GRID
851 852
 

+ 2
- 1
Marlin/example_configurations/makibox/Configuration.h Zobrazit soubor

@@ -754,7 +754,8 @@
754 754
 
755 755
     // Set the number of grid points per dimension.
756 756
     // You probably don't need more than 3 (squared=9).
757
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
757
+    #define ABL_GRID_POINTS_X 3
758
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
758 759
 
759 760
   #else  // !AUTO_BED_LEVELING_GRID
760 761
 

+ 2
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration.h Zobrazit soubor

@@ -747,7 +747,8 @@
747 747
 
748 748
     // Set the number of grid points per dimension.
749 749
     // You probably don't need more than 3 (squared=9).
750
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
750
+    #define ABL_GRID_POINTS_X 3
751
+    #define ABL_GRID_POINTS_Y ABL_GRID_POINTS_X
751 752
 
752 753
   #else  // !AUTO_BED_LEVELING_GRID
753 754
 

Loading…
Zrušit
Uložit