Pārlūkot izejas kodu

Fix up allen key settings in delta configs

Scott Lahteine 10 gadus atpakaļ
vecāks
revīzija
e6baf8afd9

+ 74
- 8
Marlin/example_configurations/delta/biv2.5/Configuration.h Parādīt failu

@@ -536,14 +536,80 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
536 536
   //#define Z_PROBE_ALLEN_KEY
537 537
 
538 538
   #ifdef Z_PROBE_ALLEN_KEY
539
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30
540
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS
541
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_Z 100
542
-    
543
-    #define Z_PROBE_ALLEN_KEY_STOW_X     -64
544
-    #define Z_PROBE_ALLEN_KEY_STOW_Y     56
545
-    #define Z_PROBE_ALLEN_KEY_STOW_Z     23
546
-    #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
539
+    // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
540
+    // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
541
+
542
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
543
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
544
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100
545
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
546
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0
547
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
548
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100
549
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
550
+
551
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
552
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
553
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
554
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
555
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
556
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
557
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
558
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10)
559
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
560
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
561
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
562
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X
563
+
564
+    // Kossel Mini
565
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
566
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
567
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
568
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10)
569
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
570
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
571
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
572
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
573
+
574
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
575
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
576
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
577
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
578
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
579
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
580
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
581
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10)
582
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
583
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
584
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
585
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
586
+
587
+    // Kossel Pro
588
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
589
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
590
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
591
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
592
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
593
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
594
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
595
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X
596
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
597
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
598
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
599
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2)
600
+
601
+    #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
602
+    #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
603
+    #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
604
+    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
605
+    #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
606
+    #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
607
+    #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
608
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2)
609
+    #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
610
+    #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
611
+    #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
612
+    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
547 613
   #endif
548 614
 
549 615
   //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk

+ 74
- 8
Marlin/example_configurations/delta/generic/Configuration.h Parādīt failu

@@ -539,14 +539,80 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
539 539
   //#define Z_PROBE_ALLEN_KEY
540 540
 
541 541
   #ifdef Z_PROBE_ALLEN_KEY
542
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30
543
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS
544
-    #define Z_PROBE_ALLEN_KEY_DEPLOY_Z 100
545
-    
546
-    #define Z_PROBE_ALLEN_KEY_STOW_X     -64
547
-    #define Z_PROBE_ALLEN_KEY_STOW_Y     56
548
-    #define Z_PROBE_ALLEN_KEY_STOW_Z     23
549
-    #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20
542
+    // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
543
+    // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
544
+
545
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
546
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
547
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
548
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
549
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
550
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
551
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
552
+    #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
553
+
554
+    #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position
555
+    #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0
556
+    #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0
557
+    #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
558
+    #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down
559
+    #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0
560
+    #define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0
561
+    #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10)
562
+    #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear
563
+    #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0
564
+    #define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0
565
+    #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X
566
+
567
+    // Kossel Mini
568
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0
569
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0
570
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
571
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10)
572
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
573
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0
574
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
575
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
576
+
577
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position
578
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0
579
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0
580
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
581
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position.
582
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0
583
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0
584
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10)
585
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything
586
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0
587
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0
588
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
589
+
590
+    // Kossel Pro
591
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt
592
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00
593
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
594
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
595
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm
596
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00
597
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
598
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X
599
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin
600
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00
601
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0
602
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2)
603
+
604
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip
605
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00
606
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0
607
+    //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X
608
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe
609
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00
610
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0
611
+    //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2)
612
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0  // return to 0,0,100
613
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0
614
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0
615
+    //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z
550 616
   #endif
551 617
 
552 618
   //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk

+ 4
- 4
Marlin/example_configurations/delta/kossel_pro/Configuration.h Parādīt failu

@@ -576,13 +576,13 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
576 576
     // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29,
577 577
     // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe.
578 578
 
579
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30
579
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0
580 580
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS
581
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100
581
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0
582 582
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X
583
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0
583
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0
584 584
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS
585
-    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100
585
+    //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0
586 586
     //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10)
587 587
 
588 588
     //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position

Notiek ielāde…
Atcelt
Saglabāt