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

Merge pull request #3928 from thinkyhead/rc_allen_key_cleanup 

Remove excess allen key probe examples from configs
Scott Lahteine 8 years ago
parent
1a01a44a94 43a71ef226
commit
2bd4f33369
5 changed files with 23 additions and 242 deletions
Split View Show Diff Stats
  1. 7
    47
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  2. 4
    50
      Marlin/example_configurations/delta/generic/Configuration.h
  3. 2
    49
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  4. 6
    46
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  5. 4
    50
      Marlin/example_configurations/delta/kossel_xl/Configuration.h

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

@@ -691,60 +691,17 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
691 691 
     // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
692 692 
     // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
693 693
694 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
695 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
696 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
697 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
698 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
699 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
700 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
701 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
702 
-
703 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
704 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
705 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
706 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
707 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
708 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
709 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
710 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
711 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
712 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
713 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
714 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
715 
-
716 
-    // Kossel Mini
717 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
718 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
719 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
720 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
721 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
722 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
723 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
724 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
725 
-
726 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
727 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
728 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
729 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
730 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
731 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
732 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
733 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
734 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
735 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
736 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
737 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
738 
-
739 
-    // Kossel Pro
694 
+    // Just like Kossel Pro
740 695 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
741 696 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
742 697 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
743 698 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
699 
+
744 700 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
745 701 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
746 702 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
747 703 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
704 
+
748 705 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
749 706 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
750 707 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
 
@@ -754,15 +711,18 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
754 711 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
755 712 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
756 713 
     #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
714 
+
757 715 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
758 716 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
759 717 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
760 718 
     #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
719 
+
761 720 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
762 721 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
763 722 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
764 723 
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
765 
-  #endif
724 
+
725 
+  #endif // Z_PROBE_ALLEN_KEY
766 726
767 727 
   // If you've enabled AUTO_BED_LEVELING_FEATURE and are using the Z Probe for Z Homing,
768 728 
   // it is highly recommended you also enable Z_SAFE_HOMING below!

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

@@ -695,6 +695,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
695 695 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
696 696 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
697 697 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
698 
+
698 699 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
699 700 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
700 701 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 
@@ -704,65 +705,18 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
704 705 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
705 706 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
706 707 
     #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
708 
+
707 709 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
708 710 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
709 711 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
710 712 
     #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
713 
+
711 714 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
712 715 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
713 716 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
714 717 
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
715 718
716 
-    // Kossel Mini
717 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
718 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
719 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
720 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
721 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
722 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
723 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
724 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
725 
-
726 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
727 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
728 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
729 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
730 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
731 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
732 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
733 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
734 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
735 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
736 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
737 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
738 
-
739 
-    // Kossel Pro
740 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
741 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
742 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
743 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
744 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
745 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
746 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
747 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
748 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
749 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
750 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
751 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
752 
-
753 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
754 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
755 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
756 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
757 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
758 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
759 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
760 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
761 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
762 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
763 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
764 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
765 
-  #endif
719 
+  #endif // Z_PROBE_ALLEN_KEY
766 720
767 721 
   // If you've enabled AUTO_BED_LEVELING_FEATURE and are using the Z Probe for Z Homing,
768 722 
   // it is highly recommended you also enable Z_SAFE_HOMING below!

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

@@ -691,33 +691,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
691 691 
     // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
692 692 
     // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
693 693
694 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
695 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
696 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
697 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
698 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
699 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
700 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
701 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
702 
-
703 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
704 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
705 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
706 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
707 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
708 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
709 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
710 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
711 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
712 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
713 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
714 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
715 
-
716 694 
     // Kossel Mini
717 695 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
718 696 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
719 697 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
720 698 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE XY_TRAVEL_SPEED
699 
+
721 700 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
722 701 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
723 702 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 
@@ -740,33 +719,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
740 719 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z  (Z_PROBE_ALLEN_KEY_STOW_1_Z+Z_PROBE_ALLEN_KEY_STOW_DEPTH)
741 720 
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE (XY_TRAVEL_SPEED/2)
742 721
743 
-    // Kossel Pro
744 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
745 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
746 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
747 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
748 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
749 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
750 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
751 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
752 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
753 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
754 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
755 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
756 
-
757 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
758 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
759 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
760 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
761 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
762 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
763 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
764 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
765 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
766 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
767 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
768 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
769 
-  #endif
722 
+  #endif // Z_PROBE_ALLEN_KEY
770 723
771 724 
   // If you've enabled AUTO_BED_LEVELING_FEATURE and are using the Z Probe for Z Homing,
772 725 
   // it is highly recommended you also enable Z_SAFE_HOMING below!

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

@@ -682,60 +682,17 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
682 682 
     // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
683 683 
     // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
684 684
685 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
686 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
687 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
688 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
689 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
690 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
691 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
692 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
693 
-
694 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
695 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
696 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
697 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
698 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
699 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
700 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
701 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
702 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
703 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
704 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
705 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
706 
-
707 
-    // Kossel Mini
708 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
709 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
710 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
711 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
712 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
713 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
714 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
715 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
716 
-
717 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
718 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
719 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
720 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
721 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
722 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
723 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
724 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
725 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
726 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
727 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
728 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
729 
-
730 685 
     // Kossel Pro
731 686 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
732 687 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
733 688 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
734 689 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
690 
+
735 691 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
736 692 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
737 693 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z Z_PROBE_ALLEN_KEY_DEPLOY_1_Z
738 694 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
695 
+
739 696 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
740 697 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
741 698 
     #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z Z_PROBE_ALLEN_KEY_DEPLOY_2_Z
 
@@ -745,15 +702,18 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
745 702 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Y -125.00
746 703 
     #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
747 704 
     #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
705 
+
748 706 
     #define Z_PROBE_ALLEN_KEY_STOW_2_X Z_PROBE_ALLEN_KEY_STOW_1_X // move down to retract probe
749 707 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Y Z_PROBE_ALLEN_KEY_STOW_1_Y
750 708 
     #define Z_PROBE_ALLEN_KEY_STOW_2_Z 0.0
751 709 
     #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
710 
+
752 711 
     #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
753 712 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
754 713 
     #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
755 714 
     #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
756 
-  #endif
715 
+
716 
+  #endif // Z_PROBE_ALLEN_KEY
757 717
758 718 
   // If you've enabled AUTO_BED_LEVELING_FEATURE and are using the Z Probe for Z Homing,
759 719 
   // it is highly recommended you also enable Z_SAFE_HOMING below!

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

@@ -693,6 +693,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
693 693 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
694 694 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
695 695 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
696 
+
696 697 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
697 698 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
698 699 
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
 
@@ -702,65 +703,18 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
702 703 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
703 704 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
704 705 
     //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
706 
+
705 707 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
706 708 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
707 709 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
708 710 
     //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
711 
+
709 712 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
710 713 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
711 714 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
712 715 
     //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
713 716
714 
-    // Kossel Mini
715 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
716 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
717 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
718 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
719 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
720 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
721 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
722 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
723 
-
724 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
725 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
726 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
727 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
728 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
729 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
730 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
731 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/10
732 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
733 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
734 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
735 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
736 
-
737 
-    // Kossel Pro
738 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
739 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
740 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
741 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_XYZ
742 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
743 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
744 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
745 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_XYZ
746 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
747 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
748 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
749 
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
750 
-
751 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
752 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
753 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
754 
-    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_XYZ
755 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
756 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
757 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
758 
-    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_XYZ)/2
759 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
760 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
761 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
762 
-    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_XYZ
763 
-  #endif
717 
+  #endif // Z_PROBE_ALLEN_KEY
764 718
765 719 
   // If you've enabled AUTO_BED_LEVELING_FEATURE and are using the Z Probe for Z Homing,
766 720 
   // it is highly recommended you also enable Z_SAFE_HOMING below!

Write Preview
Loading…
Cancel
Save