From e6baf8afd9ccebb25a9e47ca44c1837e892b11f1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 12 Jun 2015 04:17:59 -0700 Subject: [PATCH] Fix up allen key settings in delta configs --- .../delta/biv2.5/Configuration.h | 82 +++++++++++++++++-- .../delta/generic/Configuration.h | 82 +++++++++++++++++-- .../delta/kossel_pro/Configuration.h | 8 +- 3 files changed, 152 insertions(+), 20 deletions(-) diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 9a03e860c..2e0b43861 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -536,14 +536,80 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define Z_PROBE_ALLEN_KEY #ifdef Z_PROBE_ALLEN_KEY - #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30 - #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS - #define Z_PROBE_ALLEN_KEY_DEPLOY_Z 100 - - #define Z_PROBE_ALLEN_KEY_STOW_X -64 - #define Z_PROBE_ALLEN_KEY_STOW_Y 56 - #define Z_PROBE_ALLEN_KEY_STOW_Z 23 - #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 + // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29, + // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe. + + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10) + + //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position + //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down + //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10) + //#define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear + //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X + + // Kossel Mini + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10) + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10) + + //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position + //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position. + //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10) + //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything + //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z + + // Kossel Pro + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00 + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00 + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X + #define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin + #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00 + #define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2) + + #define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip + #define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00 + #define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0 + #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X + #define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe + #define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00 + #define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0 + #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2) + #define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0 // return to 0,0,100 + #define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0 + #define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0 + #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z #endif //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 1c374514b..8cabd5c86 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -539,14 +539,80 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic //#define Z_PROBE_ALLEN_KEY #ifdef Z_PROBE_ALLEN_KEY - #define Z_PROBE_ALLEN_KEY_DEPLOY_X 30 - #define Z_PROBE_ALLEN_KEY_DEPLOY_Y DELTA_PRINTABLE_RADIUS - #define Z_PROBE_ALLEN_KEY_DEPLOY_Z 100 - - #define Z_PROBE_ALLEN_KEY_STOW_X -64 - #define Z_PROBE_ALLEN_KEY_STOW_Y 56 - #define Z_PROBE_ALLEN_KEY_STOW_Z 23 - #define Z_PROBE_ALLEN_KEY_STOW_DEPTH 20 + // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29, + // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe. + + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 + #define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10) + + #define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position + #define Z_PROBE_ALLEN_KEY_STOW_1_Y 56.0 + #define Z_PROBE_ALLEN_KEY_STOW_1_Z 23.0 + #define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X + #define Z_PROBE_ALLEN_KEY_STOW_2_X -64.0 // Push it down + #define Z_PROBE_ALLEN_KEY_STOW_2_Y 56.0 + #define Z_PROBE_ALLEN_KEY_STOW_2_Z 3.0 + #define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_X/10) + #define Z_PROBE_ALLEN_KEY_STOW_3_X -64.0 // Move it up to clear + #define Z_PROBE_ALLEN_KEY_STOW_3_Y 56.0 + #define Z_PROBE_ALLEN_KEY_STOW_3_Z 50.0 + #define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_X + + // Kossel Mini + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 35.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 72.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE (HOMING_FEEDRATE_X/10) + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y 0.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10) + + //#define Z_PROBE_ALLEN_KEY_STOW_1_X -46.0 // Move the probe into position + //#define Z_PROBE_ALLEN_KEY_STOW_1_Y 59.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 28.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_STOW_2_X -46.0 // Move the nozzle down further to push the probe into retracted position. + //#define Z_PROBE_ALLEN_KEY_STOW_2_Y 59.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 8.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/10) + //#define Z_PROBE_ALLEN_KEY_STOW_3_X -46.0 // Raise things back up slightly so we don't bump into anything + //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 59.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 38.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z + + // Kossel Pro + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X -105.00 // Move left but not quite so far that we'll bump the belt + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y 0.00 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X -110.00 // Move outward to position deploy pin to the left of the arm + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y -125.00 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_X 45.00 // Move right to trigger deploy pin + //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Y -125.00 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_3_FEEDRATE (HOMING_FEEDRATE_X/2) + + //#define Z_PROBE_ALLEN_KEY_STOW_1_X 36.00 // Line up with bed retaining clip + //#define Z_PROBE_ALLEN_KEY_STOW_1_Y -122.00 + //#define Z_PROBE_ALLEN_KEY_STOW_1_Z 75.0 + //#define Z_PROBE_ALLEN_KEY_STOW_1_FEEDRATE HOMING_FEEDRATE_X + //#define Z_PROBE_ALLEN_KEY_STOW_2_X 36.00 // move down to retract probe + //#define Z_PROBE_ALLEN_KEY_STOW_2_Y -122.00 + //#define Z_PROBE_ALLEN_KEY_STOW_2_Z 25.0 + //#define Z_PROBE_ALLEN_KEY_STOW_2_FEEDRATE (HOMING_FEEDRATE_Z/2) + //#define Z_PROBE_ALLEN_KEY_STOW_3_X 0.0 // return to 0,0,100 + //#define Z_PROBE_ALLEN_KEY_STOW_3_Y 0.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_Z 100.0 + //#define Z_PROBE_ALLEN_KEY_STOW_3_FEEDRATE HOMING_FEEDRATE_Z #endif //If defined, the Probe servo will be turned on only during movement and then turned off to avoid jerk diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 3414339dd..cbe13059e 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -576,13 +576,13 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic // 2 or 3 sets of coordinates for deploying and retracting the spring loaded touch probe on G29, // if servo actuated touch probe is not defined. Uncomment as appropriate for your printer/probe. - //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_X 30.0 //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Y DELTA_PRINTABLE_RADIUS - //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_Z 100.0 //#define Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE HOMING_FEEDRATE_X - //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_X 0.0 //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Y DELTA_PRINTABLE_RADIUS - //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100 + //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_Z 100.0 //#define Z_PROBE_ALLEN_KEY_DEPLOY_2_FEEDRATE (HOMING_FEEDRATE_X/10) //#define Z_PROBE_ALLEN_KEY_STOW_1_X -64.0 // Move the probe into position