浏览代码

Merge pull request #1616 from thinkyhead/topo_map_origin

Move TOPO_ORIGIN define to Configuration.h
Scott Lahteine 10 年前
父节点
当前提交
cbe4496123

+ 5
- 0
Marlin/Configuration.h 查看文件

398
 
398
 
399
   #ifdef AUTO_BED_LEVELING_GRID
399
   #ifdef AUTO_BED_LEVELING_GRID
400
 
400
 
401
+    // Use one of these defines to specify the origin
402
+    // for a topographical map to be printed for your bed.
403
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
404
+    #define TOPO_ORIGIN OriginFrontLeft
405
+
401
     // The edges of the rectangle in which to probe
406
     // The edges of the rectangle in which to probe
402
     #define LEFT_PROBE_BED_POSITION 15
407
     #define LEFT_PROBE_BED_POSITION 15
403
     #define RIGHT_PROBE_BED_POSITION 170
408
     #define RIGHT_PROBE_BED_POSITION 170

+ 0
- 6
Marlin/Marlin_main.cpp 查看文件

1854
    *     Usage: "G29 E" or "G29 e"
1854
    *     Usage: "G29 E" or "G29 e"
1855
    *
1855
    *
1856
    */
1856
    */
1857
-
1858
-  // Use one of these defines to specify the origin
1859
-  // for a topographical map to be printed for your bed.
1860
-  enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
1861
-  #define TOPO_ORIGIN OriginFrontLeft
1862
-
1863
   inline void gcode_G29() {
1857
   inline void gcode_G29() {
1864
 
1858
 
1865
     // Prevent user from running a G29 without first homing in X and Y
1859
     // Prevent user from running a G29 without first homing in X and Y

+ 5
- 0
Marlin/configurator/config/Configuration.h 查看文件

438
 
438
 
439
   #ifdef AUTO_BED_LEVELING_GRID
439
   #ifdef AUTO_BED_LEVELING_GRID
440
 
440
 
441
+    // Use one of these defines to specify the origin
442
+    // for a topographical map to be printed for your bed.
443
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
444
+    #define TOPO_ORIGIN OriginFrontLeft
445
+
441
     // The edges of the rectangle in which to probe
446
     // The edges of the rectangle in which to probe
442
     #define LEFT_PROBE_BED_POSITION 15
447
     #define LEFT_PROBE_BED_POSITION 15
443
     #define RIGHT_PROBE_BED_POSITION 170
448
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/Felix/Configuration.h 查看文件

384
   // Note: this feature occupies 10'206 byte
384
   // Note: this feature occupies 10'206 byte
385
   #ifdef AUTO_BED_LEVELING_GRID
385
   #ifdef AUTO_BED_LEVELING_GRID
386
 
386
 
387
+    // Use one of these defines to specify the origin
388
+    // for a topographical map to be printed for your bed.
389
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
390
+    #define TOPO_ORIGIN OriginFrontLeft
391
+
387
     // set the rectangle in which to probe
392
     // set the rectangle in which to probe
388
     #define LEFT_PROBE_BED_POSITION 15
393
     #define LEFT_PROBE_BED_POSITION 15
389
     #define RIGHT_PROBE_BED_POSITION 170
394
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/Felix/Configuration_DUAL.h 查看文件

384
   // Note: this feature occupies 10'206 byte
384
   // Note: this feature occupies 10'206 byte
385
   #ifdef AUTO_BED_LEVELING_GRID
385
   #ifdef AUTO_BED_LEVELING_GRID
386
 
386
 
387
+    // Use one of these defines to specify the origin
388
+    // for a topographical map to be printed for your bed.
389
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
390
+    #define TOPO_ORIGIN OriginFrontLeft
391
+
387
     // set the rectangle in which to probe
392
     // set the rectangle in which to probe
388
     #define LEFT_PROBE_BED_POSITION 15
393
     #define LEFT_PROBE_BED_POSITION 15
389
     #define RIGHT_PROBE_BED_POSITION 170
394
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/Hephestos/Configuration.h 查看文件

408
 
408
 
409
   #ifdef AUTO_BED_LEVELING_GRID
409
   #ifdef AUTO_BED_LEVELING_GRID
410
 
410
 
411
+    // Use one of these defines to specify the origin
412
+    // for a topographical map to be printed for your bed.
413
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
414
+    #define TOPO_ORIGIN OriginFrontLeft
415
+
411
     // The edges of the rectangle in which to probe
416
     // The edges of the rectangle in which to probe
412
     #define LEFT_PROBE_BED_POSITION 15
417
     #define LEFT_PROBE_BED_POSITION 15
413
     #define RIGHT_PROBE_BED_POSITION 170
418
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/K8200/Configuration.h 查看文件

413
 
413
 
414
   #ifdef AUTO_BED_LEVELING_GRID
414
   #ifdef AUTO_BED_LEVELING_GRID
415
 
415
 
416
+    // Use one of these defines to specify the origin
417
+    // for a topographical map to be printed for your bed.
418
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
419
+    #define TOPO_ORIGIN OriginFrontLeft
420
+
416
     // The edges of the rectangle in which to probe
421
     // The edges of the rectangle in which to probe
417
     #define LEFT_PROBE_BED_POSITION 15
422
     #define LEFT_PROBE_BED_POSITION 15
418
     #define RIGHT_PROBE_BED_POSITION 170
423
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/SCARA/Configuration.h 查看文件

437
 
437
 
438
   #ifdef AUTO_BED_LEVELING_GRID
438
   #ifdef AUTO_BED_LEVELING_GRID
439
 
439
 
440
+    // Use one of these defines to specify the origin
441
+    // for a topographical map to be printed for your bed.
442
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
443
+    #define TOPO_ORIGIN OriginFrontLeft
444
+
440
     // The edges of the rectangle in which to probe
445
     // The edges of the rectangle in which to probe
441
     #define LEFT_PROBE_BED_POSITION 15
446
     #define LEFT_PROBE_BED_POSITION 15
442
     #define RIGHT_PROBE_BED_POSITION 170
447
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/WITBOX/Configuration.h 查看文件

407
 
407
 
408
   #ifdef AUTO_BED_LEVELING_GRID
408
   #ifdef AUTO_BED_LEVELING_GRID
409
 
409
 
410
+    // Use one of these defines to specify the origin
411
+    // for a topographical map to be printed for your bed.
412
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
413
+    #define TOPO_ORIGIN OriginFrontLeft
414
+
410
     // The edges of the rectangle in which to probe
415
     // The edges of the rectangle in which to probe
411
     #define LEFT_PROBE_BED_POSITION 15
416
     #define LEFT_PROBE_BED_POSITION 15
412
     #define RIGHT_PROBE_BED_POSITION 170
417
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/makibox/Configuration.h 查看文件

405
 
405
 
406
   #ifdef AUTO_BED_LEVELING_GRID
406
   #ifdef AUTO_BED_LEVELING_GRID
407
 
407
 
408
+    // Use one of these defines to specify the origin
409
+    // for a topographical map to be printed for your bed.
410
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
411
+    #define TOPO_ORIGIN OriginFrontLeft
412
+
408
     // The edges of the rectangle in which to probe
413
     // The edges of the rectangle in which to probe
409
     #define LEFT_PROBE_BED_POSITION 15
414
     #define LEFT_PROBE_BED_POSITION 15
410
     #define RIGHT_PROBE_BED_POSITION 170
415
     #define RIGHT_PROBE_BED_POSITION 170

+ 5
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h 查看文件

407
 
407
 
408
   #ifdef AUTO_BED_LEVELING_GRID
408
   #ifdef AUTO_BED_LEVELING_GRID
409
 
409
 
410
+    // Use one of these defines to specify the origin
411
+    // for a topographical map to be printed for your bed.
412
+    enum { OriginBackLeft, OriginFrontLeft, OriginBackRight, OriginFrontRight };
413
+    #define TOPO_ORIGIN OriginFrontLeft
414
+
410
     // The edges of the rectangle in which to probe
415
     // The edges of the rectangle in which to probe
411
     #define LEFT_PROBE_BED_POSITION 15
416
     #define LEFT_PROBE_BED_POSITION 15
412
     #define RIGHT_PROBE_BED_POSITION 170
417
     #define RIGHT_PROBE_BED_POSITION 170

正在加载...
取消
保存