From ab624eac2afc7a837b915e459f2e9c85ed70200a Mon Sep 17 00:00:00 2001 From: Jim Morris Date: Wed, 24 Jul 2013 02:57:46 -0700 Subject: [PATCH] revert COnfiguratiuon to the same as head --- Marlin/Configuration.h | 81 ++------------------------------------ Marlin/Configuration_adv.h | 12 +----- 2 files changed, 5 insertions(+), 88 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 3e508424f..db02b1d5f 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -74,7 +74,7 @@ //=========================================================================== //============================== Delta Settings ============================= //=========================================================================== -// Enable DELTA kinematics and most of the default configuration for Deltas +// Enable DELTA kinematics //#define DELTA // Make delta curves from many straight lines (linear interpolation). @@ -278,26 +278,11 @@ #endif // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins. -#ifdef DELTA -const bool X_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. -const bool Y_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. -const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of the endstops. - -#else const bool X_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. const bool Y_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of the endstops. -#endif // DELTA - -#ifdef DELTA -// deltas never have min endstops -#define DISABLE_MIN_ENDSTOPS - -#else - //#define DISABLE_MAX_ENDSTOPS //#define DISABLE_MIN_ENDSTOPS -#endif // delta // Disable max endstops for compatibility with endstop checking routine #if defined(COREXY) && !defined(DISABLE_MAX_ENDSTOPS) @@ -316,58 +301,28 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th #define DISABLE_Z false #define DISABLE_E false // For all extruders -#ifdef DELTA -#define INVERT_X_DIR false // DELTA does not invert -#define INVERT_Y_DIR false -#define INVERT_Z_DIR false - -#else - -#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true +#define INVERT_X_DIR true // for Mendel set to false, for Orca set to true #define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false #define INVERT_Z_DIR true // for Mendel set to false, for Orca set to true -#endif // DELTA - #define INVERT_E0_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E1_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false #define INVERT_E2_DIR false // for direct drive extruder v9 set to true, for geared extruder set to false // ENDSTOP SETTINGS: // Sets direction of endstops when homing; 1=MAX, -1=MIN -#ifdef DELTA -// deltas always home to max -#define X_HOME_DIR 1 -#define Y_HOME_DIR 1 -#define Z_HOME_DIR 1 - -#else - #define X_HOME_DIR -1 #define Y_HOME_DIR -1 #define Z_HOME_DIR -1 -#endif // delta #define min_software_endstops true // If true, axis won't move to coordinates less than HOME_POS. #define max_software_endstops true // If true, axis won't move to coordinates greater than the defined lengths below. - // Travel limits after homing -#ifdef DELTA -#define X_MAX_POS 90 -#define X_MIN_POS -90 -#define Y_MAX_POS 90 -#define Y_MIN_POS -90 -#define Z_MAX_POS MANUAL_Z_HOME_POS -#define Z_MIN_POS 0 - -#else - #define X_MAX_POS 205 #define X_MIN_POS 0 #define Y_MAX_POS 205 #define Y_MIN_POS 0 #define Z_MAX_POS 200 #define Z_MIN_POS 0 -#endif // DELTA #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS) #define Y_MAX_LENGTH (Y_MAX_POS - Y_MIN_POS) @@ -378,48 +333,22 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th //#define BED_CENTER_AT_0_0 // If defined, the center of the bed is at (X=0, Y=0) //Manual homing switch locations: - -#ifdef DELTA -#define MANUAL_HOME_POSITIONS // MANUAL_*_HOME_POS below will be used // For deltabots this means top and center of the cartesian print volume. -#define MANUAL_X_HOME_POS 0 -#define MANUAL_Y_HOME_POS 0 -#define MANUAL_Z_HOME_POS 250 // For delta: Distance between nozzle and print surface after homing. - -#else - #define MANUAL_X_HOME_POS 0 #define MANUAL_Y_HOME_POS 0 #define MANUAL_Z_HOME_POS 0 -#endif // DELTA +//#define MANUAL_Z_HOME_POS 402 // For delta: Distance between nozzle and print surface after homing. //// MOVEMENT SETTINGS #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E - -#ifdef DELTA -// delta homing speeds must be the same on xyz -#define HOMING_FEEDRATE {200*60, 200*60, 200*60, 0} // set the homing speeds (mm/min) - -#else - #define HOMING_FEEDRATE {50*60, 50*60, 4*60, 0} // set the homing speeds (mm/min) -#endif // DELTA // default settings -#ifdef DELTA -// delta speeds must be the same on xyz -#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 80, 80, 760*1.1} // default steps per unit for Kossel (GT2, 20 tooth) -#define DEFAULT_MAX_FEEDRATE {500, 500, 500, 25} // (mm/sec) -#define DEFAULT_MAX_ACCELERATION {9000,9000,9000,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot. - -#else #define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200.0*8/3,760*1.1} // default steps per unit for Ultimaker #define DEFAULT_MAX_FEEDRATE {500, 500, 5, 25} // (mm/sec) #define DEFAULT_MAX_ACCELERATION {9000,9000,100,10000} // X, Y, Z, E maximum start speed for accelerated moves. E default values are good for skeinforge 40+, for older versions raise them a lot. -#endif // DELTA - #define DEFAULT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves #define DEFAULT_RETRACT_ACCELERATION 3000 // X, Y, Z and E max acceleration in mm/s^2 for retracts @@ -431,11 +360,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th // The speed change that does not require acceleration (i.e. the software might assume it can be done instantaneously) #define DEFAULT_XYJERK 20.0 // (mm/sec) -#ifdef DELTA -#define DEFAULT_ZJERK 20.0 // (mm/sec) Must be same as XY for delta -#else #define DEFAULT_ZJERK 0.4 // (mm/sec) -#endif // DELTA #define DEFAULT_EJERK 5.0 // (mm/sec) //=========================================================================== diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 4dfe4ba62..f555d6069 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -173,13 +173,8 @@ //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: #define X_HOME_RETRACT_MM 5 -#define Y_HOME_RETRACT_MM 5 -#ifdef DELTA -#define Z_HOME_RETRACT_MM 5 -#else -#define Z_HOME_RETRACT_MM 1 -#endif - +#define Y_HOME_RETRACT_MM 5 +#define Z_HOME_RETRACT_MM 1 //#define QUICK_HOME //if this is defined, if both x and y are to be homed, a diagonal move will be performed initially. #define AXIS_RELATIVE_MODES {false, false, false, false} @@ -202,10 +197,7 @@ #define DEFAULT_MINSEGMENTTIME 20000 // If defined the movements slow down when the look ahead buffer is only half full -// (don't use SLOWDOWN with DELTA because DELTA generates hundreds of segments per second) -#ifndef DELTA #define SLOWDOWN -#endif // Frequency limit // See nophead's blog for more info