thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #3228 from esenapaj/patch-1 

Fix spelling
Scott Lahteine 8 years ago
parent
af6049c6c2 89a845659a
commit
4823791eb0
7 changed files with 27 additions and 27 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/SanityCheck.h
  3. 5
    5
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  4. 5
    5
      Marlin/example_configurations/delta/generic/Configuration.h
  5. 5
    5
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  6. 5
    5
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  7. 5
    5
      Marlin/example_configurations/delta/kossel_xl/Configuration.h

+ 1
- 1
Marlin/Marlin_main.cpp View File

3084 
           #if ENABLED(DELTA)
 3084 
           #if ENABLED(DELTA)
3085 
             // Avoid probing the corners (outside the round or hexagon print surface) on a delta printer.
 3085 
             // Avoid probing the corners (outside the round or hexagon print surface) on a delta printer.
3086 
             float distance_from_center = sqrt(xProbe * xProbe + yProbe * yProbe);
 3086 
             float distance_from_center = sqrt(xProbe * xProbe + yProbe * yProbe);
3087 
-            if (distance_from_center > DELTA_PROBABLE_RADIUS) continue;
3087 
+            if (distance_from_center > DELTA_PROBEABLE_RADIUS) continue;
3088 
           #endif //DELTA
 3088 
           #endif //DELTA
3089
3089
3090 
           ProbeAction act;
 3090 
           ProbeAction act;

+ 1
- 1
Marlin/SanityCheck.h View File

220 
    * Check if Probe_Offset * Grid Points is greater than Probing Range
 220 
    * Check if Probe_Offset * Grid Points is greater than Probing Range
221 
    */
 221 
    */
222 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
 222 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
223 
-    #ifndef DELTA_PROBABLE_RADIUS
223 
+    #ifndef DELTA_PROBEABLE_RADIUS
224 
       // Be sure points are in the right order
 224 
       // Be sure points are in the right order
225 
       #if LEFT_PROBE_BED_POSITION > RIGHT_PROBE_BED_POSITION
 225 
       #if LEFT_PROBE_BED_POSITION > RIGHT_PROBE_BED_POSITION
226 
         #error LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION.
 226 
         #error LEFT_PROBE_BED_POSITION must be less than RIGHT_PROBE_BED_POSITION.

+ 5
- 5
Marlin/example_configurations/delta/biv2.5/Configuration.h View File

567 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
 567 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
568
568
569 
     // Set the rectangle in which to probe.
 569 
     // Set the rectangle in which to probe.
570 
-    #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
571 
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
572 
-    #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
573 
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
574 
-    #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
570 
+    #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
571 
+    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
572 
+    #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
573 
+    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
574 
+    #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
575
575
576 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
 576 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
577
577

+ 5
- 5
Marlin/example_configurations/delta/generic/Configuration.h View File

567 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
 567 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
568
568
569 
     // set the rectangle in which to probe
 569 
     // set the rectangle in which to probe
570 
-    #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
571 
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
572 
-    #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
573 
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
574 
-    #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
570 
+    #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
571 
+    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
572 
+    #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
573 
+    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
574 
+    #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
575
575
576 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
 576 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
577
577

+ 5
- 5
Marlin/example_configurations/delta/kossel_mini/Configuration.h View File

567 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
 567 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
568
568
569 
     // set the rectangle in which to probe
 569 
     // set the rectangle in which to probe
570 
-    #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
571 
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
572 
-    #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
573 
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
574 
-    #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
570 
+    #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
571 
+    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
572 
+    #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
573 
+    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
574 
+    #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
575
575
576 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
 576 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
577
577

+ 5
- 5
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

554 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
 554 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
555
555
556 
     // set the rectangle in which to probe
 556 
     // set the rectangle in which to probe
557 
-    #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS-25)
558 
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
559 
-    #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
560 
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
561 
-    #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
557 
+    #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS-25)
558 
+    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
559 
+    #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
560 
+    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
561 
+    #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
562
562
563 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
 563 
     #define MIN_PROBE_EDGE 10 // The Z probe minimum square sides can be no smaller than this.
564
564

+ 5
- 5
Marlin/example_configurations/delta/kossel_xl/Configuration.h View File

559
559
560 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
 560 
   #if ENABLED(AUTO_BED_LEVELING_GRID)
561
561
562 
-    #define DELTA_PROBABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
563 
-    #define LEFT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
564 
-    #define RIGHT_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
565 
-    #define FRONT_PROBE_BED_POSITION -DELTA_PROBABLE_RADIUS
566 
-    #define BACK_PROBE_BED_POSITION DELTA_PROBABLE_RADIUS
562 
+    #define DELTA_PROBEABLE_RADIUS (DELTA_PRINTABLE_RADIUS - 10)
563 
+    #define LEFT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
564 
+    #define RIGHT_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
565 
+    #define FRONT_PROBE_BED_POSITION -DELTA_PROBEABLE_RADIUS
566 
+    #define BACK_PROBE_BED_POSITION DELTA_PROBEABLE_RADIUS
567
567
568 
     #define MIN_PROBE_EDGE 20 // The Z probe minimum square sides can be no smaller than this.
 568 
     #define MIN_PROBE_EDGE 20 // The Z probe minimum square sides can be no smaller than this.
569
569

Write Preview
Loading…
Cancel
Save