Browse Source

Make XY_PROBE_SPEED a general probe option

Scott Lahteine 8 years ago
parent
commit
d50539583a

+ 3
- 2
Marlin/Configuration.h View File

456
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
456
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
457
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
457
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
458
 
458
 
459
+// X and Y axis travel speed (mm/m) between probes
460
+#define XY_PROBE_SPEED 8000
461
+
459
 //
462
 //
460
 // Allen Key Probe is defined in the Delta example configurations.
463
 // Allen Key Probe is defined in the Delta example configurations.
461
 //
464
 //
667
 
670
 
668
   #endif // !AUTO_BED_LEVELING_GRID
671
   #endif // !AUTO_BED_LEVELING_GRID
669
 
672
 
670
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
671
-
672
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
673
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
673
 
674
 
674
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
675
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 2
- 0
Marlin/Marlin_main.cpp View File

370
   int xy_probe_speed = XY_PROBE_SPEED;
370
   int xy_probe_speed = XY_PROBE_SPEED;
371
   bool bed_leveling_in_progress = false;
371
   bool bed_leveling_in_progress = false;
372
   #define XY_PROBE_FEEDRATE xy_probe_speed
372
   #define XY_PROBE_FEEDRATE xy_probe_speed
373
+#elif defined(XY_PROBE_SPEED)
374
+  #define XY_PROBE_FEEDRATE XY_PROBE_SPEED
373
 #else
375
 #else
374
   #define XY_PROBE_FEEDRATE (min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60)
376
   #define XY_PROBE_FEEDRATE (min(planner.max_feedrate[X_AXIS], planner.max_feedrate[Y_AXIS]) * 60)
375
 #endif
377
 #endif

+ 3
- 2
Marlin/example_configurations/Cartesio/Configuration.h View File

455
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
455
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 10  // Y offset: -front +behind [the nozzle]
456
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
456
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
457
 
457
 
458
+// X and Y axis travel speed (mm/m) between probes
459
+#define XY_PROBE_SPEED 8000
460
+
458
 //
461
 //
459
 // Allen Key Probe is defined in the Delta example configurations.
462
 // Allen Key Probe is defined in the Delta example configurations.
460
 //
463
 //
666
 
669
 
667
   #endif // !AUTO_BED_LEVELING_GRID
670
   #endif // !AUTO_BED_LEVELING_GRID
668
 
671
 
669
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
670
-
671
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
672
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
672
 
673
 
673
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
674
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/Felix/Configuration.h View File

438
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
438
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
439
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
439
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
440
 
440
 
441
+// X and Y axis travel speed (mm/m) between probes
442
+#define XY_PROBE_SPEED 8000
443
+
441
 //
444
 //
442
 // Allen Key Probe is defined in the Delta example configurations.
445
 // Allen Key Probe is defined in the Delta example configurations.
443
 //
446
 //
649
 
652
 
650
   #endif // !AUTO_BED_LEVELING_GRID
653
   #endif // !AUTO_BED_LEVELING_GRID
651
 
654
 
652
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
653
-
654
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
655
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
655
 
656
 
656
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
657
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/Felix/DUAL/Configuration.h View File

436
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
436
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
437
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
437
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
438
 
438
 
439
+// X and Y axis travel speed (mm/m) between probes
440
+#define XY_PROBE_SPEED 8000
441
+
439
 //
442
 //
440
 // Allen Key Probe is defined in the Delta example configurations.
443
 // Allen Key Probe is defined in the Delta example configurations.
441
 //
444
 //
647
 
650
 
648
   #endif // !AUTO_BED_LEVELING_GRID
651
   #endif // !AUTO_BED_LEVELING_GRID
649
 
652
 
650
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
651
-
652
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
653
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
653
 
654
 
654
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
655
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/Hephestos/Configuration.h View File

448
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
448
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
449
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
449
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
450
 
450
 
451
+// X and Y axis travel speed (mm/m) between probes
452
+#define XY_PROBE_SPEED 8000
453
+
451
 //
454
 //
452
 // Allen Key Probe is defined in the Delta example configurations.
455
 // Allen Key Probe is defined in the Delta example configurations.
453
 //
456
 //
659
 
662
 
660
   #endif // !AUTO_BED_LEVELING_GRID
663
   #endif // !AUTO_BED_LEVELING_GRID
661
 
664
 
662
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
663
-
664
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
665
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
665
 
666
 
666
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
667
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/Hephestos_2/Configuration.h View File

450
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
450
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 15  // Y offset: -front +behind [the nozzle]
451
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
451
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0   // Z offset: -below +above  [the nozzle]
452
 
452
 
453
+// X and Y axis travel speed (mm/m) between probes
454
+#define XY_PROBE_SPEED 8000
455
+
453
 //
456
 //
454
 // Allen Key Probe is defined in the Delta example configurations.
457
 // Allen Key Probe is defined in the Delta example configurations.
455
 //
458
 //
661
 
664
 
662
   #endif // !AUTO_BED_LEVELING_GRID
665
   #endif // !AUTO_BED_LEVELING_GRID
663
 
666
 
664
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
665
-
666
   #define Z_RAISE_BETWEEN_PROBINGS 2  // How much the Z axis will be raised when traveling from between next probing points.
667
   #define Z_RAISE_BETWEEN_PROBINGS 2  // How much the Z axis will be raised when traveling from between next probing points.
667
 
668
 
668
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
669
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/K8200/Configuration.h View File

473
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
473
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
474
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
474
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
475
 
475
 
476
+// X and Y axis travel speed (mm/m) between probes
477
+#define XY_PROBE_SPEED 8000
478
+
476
 //
479
 //
477
 // Allen Key Probe is defined in the Delta example configurations.
480
 // Allen Key Probe is defined in the Delta example configurations.
478
 //
481
 //
684
 
687
 
685
   #endif // !AUTO_BED_LEVELING_GRID
688
   #endif // !AUTO_BED_LEVELING_GRID
686
 
689
 
687
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
688
-
689
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
690
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
690
 
691
 
691
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
692
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h View File

456
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
456
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
457
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
457
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
458
 
458
 
459
+// X and Y axis travel speed (mm/m) between probes
460
+#define XY_PROBE_SPEED 8000
461
+
459
 //
462
 //
460
 // Allen Key Probe is defined in the Delta example configurations.
463
 // Allen Key Probe is defined in the Delta example configurations.
461
 //
464
 //
667
 
670
 
668
   #endif // !AUTO_BED_LEVELING_GRID
671
   #endif // !AUTO_BED_LEVELING_GRID
669
 
672
 
670
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
671
-
672
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
673
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
673
 
674
 
674
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
675
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/RigidBot/Configuration.h View File

450
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
450
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
451
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
451
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
452
 
452
 
453
+// X and Y axis travel speed (mm/m) between probes
454
+#define XY_PROBE_SPEED 8000
455
+
453
 //
456
 //
454
 // Allen Key Probe is defined in the Delta example configurations.
457
 // Allen Key Probe is defined in the Delta example configurations.
455
 //
458
 //
661
 
664
 
662
   #endif // !AUTO_BED_LEVELING_GRID
665
   #endif // !AUTO_BED_LEVELING_GRID
663
 
666
 
664
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
665
-
666
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
667
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
667
 
668
 
668
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
669
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/SCARA/Configuration.h View File

464
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
464
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
465
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
465
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
466
 
466
 
467
+// X and Y axis travel speed (mm/m) between probes
468
+#define XY_PROBE_SPEED 8000
469
+
467
 //
470
 //
468
 // Allen Key Probe is defined in the Delta example configurations.
471
 // Allen Key Probe is defined in the Delta example configurations.
469
 //
472
 //
675
 
678
 
676
   #endif // !AUTO_BED_LEVELING_GRID
679
   #endif // !AUTO_BED_LEVELING_GRID
677
 
680
 
678
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
679
-
680
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
681
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
681
 
682
 
682
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
683
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/TAZ4/Configuration.h View File

477
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
477
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
478
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
478
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
479
 
479
 
480
+// X and Y axis travel speed (mm/m) between probes
481
+#define XY_PROBE_SPEED 8000
482
+
480
 //
483
 //
481
 // Allen Key Probe is defined in the Delta example configurations.
484
 // Allen Key Probe is defined in the Delta example configurations.
482
 //
485
 //
688
 
691
 
689
   #endif // !AUTO_BED_LEVELING_GRID
692
   #endif // !AUTO_BED_LEVELING_GRID
690
 
693
 
691
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
692
-
693
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
694
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
694
 
695
 
695
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
696
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/WITBOX/Configuration.h View File

448
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
448
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
449
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
449
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
450
 
450
 
451
+// X and Y axis travel speed (mm/m) between probes
452
+#define XY_PROBE_SPEED 8000
453
+
451
 //
454
 //
452
 // Allen Key Probe is defined in the Delta example configurations.
455
 // Allen Key Probe is defined in the Delta example configurations.
453
 //
456
 //
659
 
662
 
660
   #endif // !AUTO_BED_LEVELING_GRID
663
   #endif // !AUTO_BED_LEVELING_GRID
661
 
664
 
662
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
663
-
664
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
665
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
665
 
666
 
666
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
667
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

456
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
456
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
457
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
457
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
458
 
458
 
459
+// X and Y axis travel speed (mm/m) between probes
460
+#define XY_PROBE_SPEED 8000
461
+
459
 //
462
 //
460
 // Allen Key Probe is defined in the Delta example configurations.
463
 // Allen Key Probe is defined in the Delta example configurations.
461
 //
464
 //
667
 
670
 
668
   #endif // !AUTO_BED_LEVELING_GRID
671
   #endif // !AUTO_BED_LEVELING_GRID
669
 
672
 
670
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
671
-
672
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
673
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
673
 
674
 
674
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
675
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

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

498
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
498
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
499
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
499
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
500
 
500
 
501
+// X and Y axis travel speed (mm/m) between probes
502
+#define XY_PROBE_SPEED 4000
503
+
501
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
504
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
502
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
505
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
503
 //#define Z_PROBE_ALLEN_KEY
506
 //#define Z_PROBE_ALLEN_KEY
750
 
753
 
751
   #endif // !AUTO_BED_LEVELING_GRID
754
   #endif // !AUTO_BED_LEVELING_GRID
752
 
755
 
753
-  #define XY_PROBE_SPEED 4000         // X and Y axis travel speed between probes, in mm/min.
754
-
755
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
756
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
756
 
757
 
757
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
758
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

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

498
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
498
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
499
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
499
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
500
 
500
 
501
+// X and Y axis travel speed (mm/m) between probes
502
+#define XY_PROBE_SPEED 4000
503
+
501
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
504
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
502
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
505
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
503
 //#define Z_PROBE_ALLEN_KEY
506
 //#define Z_PROBE_ALLEN_KEY
744
 
747
 
745
   #endif // !AUTO_BED_LEVELING_GRID
748
   #endif // !AUTO_BED_LEVELING_GRID
746
 
749
 
747
-  #define XY_PROBE_SPEED 4000         // X and Y axis travel speed between probes, in mm/min.
748
-
749
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
750
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
750
 
751
 
751
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
752
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

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

498
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
498
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -10   // Y offset: -front +behind [the nozzle]
499
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
499
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5  // Z offset: -below +above  [the nozzle]
500
 
500
 
501
+// X and Y axis travel speed (mm/m) between probes
502
+#define XY_PROBE_SPEED 4000
503
+
501
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
504
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
502
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
505
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
503
 #define Z_PROBE_ALLEN_KEY
506
 #define Z_PROBE_ALLEN_KEY
747
 
750
 
748
   #endif // !AUTO_BED_LEVELING_GRID
751
   #endif // !AUTO_BED_LEVELING_GRID
749
 
752
 
750
-  #define XY_PROBE_SPEED 4000         // X and Y axis travel speed between probes, in mm/min.
751
-
752
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
753
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points
753
 
754
 
754
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
755
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

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

489
 // not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
489
 // not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
490
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25  // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
490
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25  // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
491
 
491
 
492
+// X and Y axis travel speed (mm/m) between probes
493
+#define XY_PROBE_SPEED 8000
494
+
492
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
495
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
493
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
496
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
494
 #define Z_PROBE_ALLEN_KEY
497
 #define Z_PROBE_ALLEN_KEY
741
 
744
 
742
   #endif // !AUTO_BED_LEVELING_GRID
745
   #endif // !AUTO_BED_LEVELING_GRID
743
 
746
 
744
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
745
-
746
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
747
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
747
 
748
 
748
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
749
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

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

496
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0     // Z probe to nozzle Y offset: -front +behind
496
 #define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0     // Z probe to nozzle Y offset: -front +behind
497
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3     // Z probe to nozzle Z offset: -below (always!)
497
 #define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3     // Z probe to nozzle Z offset: -below (always!)
498
 
498
 
499
+// X and Y axis travel speed (mm/m) between probes
500
+#define XY_PROBE_SPEED 8000
501
+
499
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
502
 // Allen key retractable z-probe as seen on many Kossel delta printers - http://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
500
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
503
 // Deploys by touching z-axis belt. Retracts by pushing the probe down. Uses Z_MIN_PIN.
501
 //#define Z_PROBE_ALLEN_KEY
504
 //#define Z_PROBE_ALLEN_KEY
742
 
745
 
743
   #endif // !AUTO_BED_LEVELING_GRID
746
   #endif // !AUTO_BED_LEVELING_GRID
744
 
747
 
745
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
746
-
747
   #define Z_RAISE_BETWEEN_PROBINGS 10 // How much the Z axis will be raised when traveling from between next probing points.
748
   #define Z_RAISE_BETWEEN_PROBINGS 10 // How much the Z axis will be raised when traveling from between next probing points.
748
 
749
 
749
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
750
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/makibox/Configuration.h View File

459
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
459
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
460
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
460
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
461
 
461
 
462
+// X and Y axis travel speed (mm/m) between probes
463
+#define XY_PROBE_SPEED 8000
464
+
462
 //
465
 //
463
 // Allen Key Probe is defined in the Delta example configurations.
466
 // Allen Key Probe is defined in the Delta example configurations.
464
 //
467
 //
670
 
673
 
671
   #endif // !AUTO_BED_LEVELING_GRID
674
   #endif // !AUTO_BED_LEVELING_GRID
672
 
675
 
673
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
674
-
675
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
676
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
676
 
677
 
677
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
678
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

+ 3
- 2
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

446
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
446
 #define Y_PROBE_OFFSET_FROM_EXTRUDER -29     // Y offset: -front +behind [the nozzle]
447
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
447
 #define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35  // Z offset: -below +above  [the nozzle]
448
 
448
 
449
+// X and Y axis travel speed (mm/m) between probes
450
+#define XY_PROBE_SPEED 8000
451
+
449
 //
452
 //
450
 // Allen Key Probe is defined in the Delta example configurations.
453
 // Allen Key Probe is defined in the Delta example configurations.
451
 //
454
 //
657
 
660
 
658
   #endif // !AUTO_BED_LEVELING_GRID
661
   #endif // !AUTO_BED_LEVELING_GRID
659
 
662
 
660
-  #define XY_PROBE_SPEED 8000         // X and Y axis travel speed between probes, in mm/min.
661
-
662
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
663
   #define Z_RAISE_BETWEEN_PROBINGS 5  // How much the Z axis will be raised when traveling from between next probing points.
663
 
664
 
664
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.
665
   //#define Z_PROBE_END_SCRIPT "G1 Z10 F12000\nG1 X15 Y330\nG1 Z0.5\nG1 Z10" // These commands will be executed in the end of G29 routine.

Loading…
Cancel
Save