changeset
proper configuration, homing and planner optimization
Fri, 17 Nov 2017 10:13:31 +0100
- author
- mdd
- date
- Fri, 17 Nov 2017 10:13:31 +0100
- changeset 3
- 770b218a4931
- parent 2
- b373b0288715
proper configuration, homing and planner optimization
| Configuration.h | file | annotate | diff | comparison | revisions | |
| Configuration_adv.h | file | annotate | diff | comparison | revisions | |
| Configuration_huxley.h | file | annotate | diff | comparison | revisions | |
| Configuration_mendel.h | file | annotate | diff | comparison | revisions | |
| Configuration_mendel2.h | file | annotate | diff | comparison | revisions | |
| Configuration_neosoft_mendel.h | file | annotate | diff | comparison | revisions | |
| Marlin.ino | file | annotate | diff | comparison | revisions |
--- a/Configuration.h Thu Jul 07 12:23:34 2016 +0200 +++ b/Configuration.h Fri Nov 17 10:13:31 2017 +0100 @@ -10,7 +10,8 @@ // Uncomment ONE of the next three lines - the one for your RepRap machine //#define REPRAPPRO_HUXLEY //#define REPRAPPRO_MENDEL //Legacy Mendel -#define REPRAPPRO_MENDEL2 // Mono Mendel +//#define REPRAPPRO_MENDEL2 // Mono Mendel +#define NEOSOFT_MENDEL // Uncomment ONE of the next two lines - the one for your master controller electronics #define REPRAPPRO_MELZI @@ -24,21 +25,23 @@ // ------------------------------------------------------------------------------- #ifndef REPRAPPRO_HUXLEY -#ifndef REPRAPPRO_MENDEL -#ifndef REPRAPPRO_MENDEL2 -#error Uncomment one of #define REPRAPPRO_HUXLEY, REPRAPPRO_MENDEL, or REPRAPPRO_MENDEL2 at the start of the file Configuration.h -#endif -#endif + #ifndef REPRAPPRO_MENDEL + #ifndef REPRAPPRO_MENDEL2 + #ifndef NEOSOFT_MENDEL + #error Uncomment one of #define REPRAPPRO_HUXLEY, REPRAPPRO_MENDEL, or REPRAPPRO_MENDEL2 at the start of the file Configuration.h + #endif + #endif + #endif #endif #ifndef REPRAPPRO_MELZI -#ifndef REPRAPPRO_SANGUINOLOLU -#error Uncomment one of #define REPRAPPRO_MELZI or REPRAPPRO_SANGUINOLOLU at the start of the file Configuration.h -#endif + #ifndef REPRAPPRO_SANGUINOLOLU + #error Uncomment one of #define REPRAPPRO_MELZI or REPRAPPRO_SANGUINOLOLU at the start of the file Configuration.h + #endif #endif #ifndef SERIAL_R -#error Uncomment one of #define SERIAL_R 10000 or 4700 at the start of the file Configuration.h + #error Uncomment one of #define SERIAL_R 10000 or 4700 at the start of the file Configuration.h #endif // ============================================================================== @@ -54,23 +57,23 @@ //User specified version info of THIS file to display in [Pronterface, etc] terminal window during startup. //Implementation of an idea by Prof Braino to inform user that any changes made //to THIS file by the user have been successfully uploaded into firmware. -#define STRING_VERSION_CONFIG_H "2014-06-02-MB" //Personal revision number for changes to THIS file. -#define STRING_CONFIG_H_AUTHOR "NEO" //Who made the changes. +#define STRING_VERSION_CONFIG_H "2017-11-18" //Personal revision number for changes to THIS file. +#define STRING_CONFIG_H_AUTHOR "NeoSoft, Malte Di Donato" //Who made the changes. // This determines the communication speed of the printer -//#define BAUDRATE 250000 -#define BAUDRATE 115200 +#define BAUDRATE 250000 +//#define BAUDRATE 115200 //// The following define selects which electronics board you have. Please choose the one that matches your setup // Sanguinololu 1.2 and above = 62 // Melzi 63 #ifdef REPRAPPRO_SANGUINOLOLU -#define MOTHERBOARD 62 + #define MOTHERBOARD 62 #endif #ifdef REPRAPPRO_MELZI -#define MOTHERBOARD 63 + #define MOTHERBOARD 63 #endif @@ -103,53 +106,16 @@ #ifdef REPRAPPRO_HUXLEY - -// Bed thermistor: VISHAY BC COMPONENTS NTCS0603E3104FXT - All Huxleys with heated bed PCB -#define BED_BETA 4100.0 -#define BED_NTC 100000.0 - -// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Huxleys before 25/2/14 -// #define E_BETA 3960.0 -// #define E_NTC 100000.0 - -// Extruder thermistor: Digikey 480-3137-ND - All Huxleys shipped after 25/2/14 -#define E_BETA 4138.0 -#define E_NTC 100000.0 - + #include "Configuration_huxley.h" #endif - - #ifdef REPRAPPRO_MENDEL - -// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Mendels before 1/4/13 -#define E_BETA 3960.0 -#define E_NTC 100000.0 - -// Bed thermistor: RS 484-0149; EPCOS B57550G103J - All Mendels before 1/4/13 -#define BED_BETA 3480.0 -#define BED_NTC 10000.0 - + #include "Configuration_mendel.h" #endif - - #ifdef REPRAPPRO_MENDEL2 - -// Bed thermistor: Rapid 61-0446 ; Semitec 103GT-2 - All Mendel2 shipped after 1/4/13 (launch) -// #define BED_BETA 4126.0 -// #define BED_NTC 10000.0 - -// Bed thermistor: Farnell 1299930 ; EPCOS B57863S103F040 - All Mendel2 shipped after 29/5/14 - #define BED_BETA 3988.0 - #define BED_NTC 10000.0 - -// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Mendel2 shipped after 1/4/13 (launch) -// #define E_BETA 3960.0 -// #define E_NTC 100000.0 - -// Extruder thermistor: Digikey 480-3137-ND - All Mendels shipped after 25/2/14 -#define E_BETA 4138.0 -#define E_NTC 100000.0 - + #include "Configuration_mendel2.h" +#endif +#ifdef NEOSOFT_MENDEL + #include "Configuration_neosoft_mendel.h" #endif @@ -159,15 +125,11 @@ #define BED_RS SERIAL_R #define BED_R_INF ( BED_NTC*exp(-BED_BETA/298.15) ) - - #define BED_USES_THERMISTOR #define HEATER_0_USES_THERMISTOR #define HEATER_1_USES_THERMISTOR #define HEATER_2_USES_THERMISTOR - - // Actual temperature must be close to target for this long before M109 returns success #define TEMP_RESIDENCY_TIME 5 // (seconds) #define TEMP_HYSTERESIS 5 // (C°) range of +/- temperatures considered "close" to the target one @@ -178,8 +140,8 @@ // Otherwise this would lead to the heater being powered on all the time. #define HEATER_0_MINTEMP 1 #ifdef REPRAPPRO_MULTIMATERIALS -#define HEATER_1_MINTEMP 1 -#define HEATER_2_MINTEMP 1 + #define HEATER_1_MINTEMP 1 + #define HEATER_2_MINTEMP 1 #endif #define BED_MINTEMP 1 @@ -188,8 +150,8 @@ // You should use MINTEMP for thermistor short/failure protection. #define HEATER_0_MAXTEMP 399 #ifdef REPRAPPRO_MULTIMATERIALS -#define HEATER_1_MAXTEMP 275 -#define HEATER_2_MAXTEMP 275 + #define HEATER_1_MAXTEMP 275 + #define HEATER_2_MAXTEMP 275 #endif #define BED_MAXTEMP 150 @@ -205,22 +167,20 @@ #define K1 0.95 //smoothing factor withing the PID #define PID_dT 0.122 //sampling period of the PID - -// RepRapPro Huxley + Mendel - #define DEFAULT_Kp 12.0 - #define DEFAULT_Ki (2.2*PID_dT) - #define DEFAULT_Kd (80/PID_dT) - + // RepRapPro Huxley + Mendel + #define DEFAULT_Kp 12.0 + #define DEFAULT_Ki (2.2*PID_dT) + #define DEFAULT_Kd (80/PID_dT) #endif // PIDTEMP #ifndef DEVELOPING -//this prevents dangerous Extruder moves, i.e. if the temperature is under the limit -//can be software-disabled for whatever purposes by -#define PREVENT_DANGEROUS_EXTRUDE -#define EXTRUDE_MINTEMP 170 -#define EXTRUDE_MAXLENGTH (999) //prevent extrusion of very large distances. + //this prevents dangerous Extruder moves, i.e. if the temperature is under the limit + //can be software-disabled for whatever purposes by + #define PREVENT_DANGEROUS_EXTRUDE + #define EXTRUDE_MINTEMP 170 + #define EXTRUDE_MAXLENGTH (999) //prevent extrusion of very large distances. #else -#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE + #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE #endif //=========================================================================== @@ -247,38 +207,6 @@ #define DISABLE_Z true #define DISABLE_E false // For all extruders -#ifdef REPRAPPRO_MENDEL -#define AXES_MAX_LENGTHS {210, 210, 140} -#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true -//#define INVERT_Y_DIR true // for Mendel set to true, for Orca set to false -#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false -#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true -#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#endif - -#ifdef REPRAPPRO_MENDEL2 -#define AXES_MAX_LENGTHS {210, 210, 140} -#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 false // for Mendel set to false, for Orca set to true -#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#endif - -#ifdef REPRAPPRO_HUXLEY -#define AXES_MAX_LENGTHS {155, 150, 90} -#define INVERT_X_DIR false // 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 false // for Mendel set to false, for Orca set to true -#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false -#endif - - // ENDSTOP SETTINGS: // Sets direction of endstops when homing; 1=MAX, -1=MIN #define X_HOME_DIR -1 @@ -296,77 +224,7 @@ //// MOVEMENT SETTINGS #define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E -/* -We've shipped a number of different configurations of belt and pulley now, so probably need some ifdef statements! At the moment, they all get the same. - -White polyurethane belt (T2.5), 14-tooth printed pulley: 91.4286 step per mm (Original Huxley, Legacy Mendel) -Black rubber belt (MXL), 17-tooth printed pulley: 92.635 step per mm (Huxley, Mendel Mono and Tri since 1/4/2013) -Black rubber belt (MXL), 18-tooth aluminium pulley: 87.489 step per mm (Huxley, Mendel Mono and Tri since 1/1/2014) - -Also, two different extruders: - -Original eMaker/RepRapPro-style: 920 steps per mm (Original Huxley, Legacy Mendel) -New version (NEMA14 and NEMA17): 660 steps per mm (Huxley, Mendel Mono and Tricolour since 1/4/2013) -*/ - -#ifdef REPRAPPRO_MENDEL - -#define X_MAX_LENGTH 210 -#define Y_MAX_LENGTH 210 -#define Z_MAX_LENGTH 110 -#define HOMING_FEEDRATE {10*60, 10*60, 1*60, 0} // set the homing speeds (mm/min) -#define FAST_HOME_FEEDRATE {50*60, 50*60, 1*60, 0} // set the homing speeds (mm/min) -#define DEFAULT_MAX_FEEDRATE {500, 500, 3, 45} -#define DEFAULT_MAX_FEEDRATE {300, 300, 3, 45} // (mm/sec) -#define DEFAULT_MAX_ACCELERATION {800,800,30,250} // X, Y, Z, E maximum start speed for accelerated moves. E default values - -// X, Y, Z, E steps per mm - -#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 91.4286, 4000, 950.0} // <- 14 tooth T2.5 belt + original extruder drive - -#else - -#ifdef REPRAPPRO_MENDEL2 - -#define X_MAX_LENGTH 210 -#define Y_MAX_LENGTH 210 -#define Z_MAX_LENGTH 110 -#define HOMING_FEEDRATE {10*60, 10*60, 1*60, 0} // set the homing speeds (mm/min) -#define FAST_HOME_FEEDRATE {50*60, 50*60, 1*60, 0} // set the homing speeds (mm/min) -#define DEFAULT_MAX_FEEDRATE {500, 500, 3, 60} -//#define DEFAULT_MAX_FEEDRATE {300, 300, 3, 45} // (mm/sec) -#define DEFAULT_MAX_ACCELERATION {1000,1000,30,250} // X, Y, Z, E maximum start speed for accelerated moves. E default values - -// X, Y, Z, E steps per mm - -#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 87.489, 4000, 950.0} // <- 18-tooth aluminium pulley -//#define DEFAULT_AXIS_STEPS_PER_UNIT {92.635, 92.635, 4000, 660} // <- 17-tooth printed pulley - -#else - -#define X_MAX_LENGTH 155 -#define Y_MAX_LENGTH 150 -#define Z_MAX_LENGTH 90 -#define HOMING_FEEDRATE {10*60, 10*60, 1*60, 0} // set the homing speeds (mm/min) -#define FAST_HOME_FEEDRATE {80*60, 80*60, 4*60, 0} // set the homing speeds (mm/min) -#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) -#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) -#define DEFAULT_MAX_ACCELERATION {1000,1000,50,250} // X, Y, Z, E maximum start speed for accelerated moves. E default values - -// X, Y, Z, E steps per mm - -#define DEFAULT_AXIS_STEPS_PER_UNIT {87.489, 87.489, 4000, 660.0} // <- 18-tooth aluminium pulley -//#define DEFAULT_AXIS_STEPS_PER_UNIT {92.635, 92.635, 4000, 660} // <- 17-tooth printed pulley -//#define DEFAULT_AXIS_STEPS_PER_UNIT {91.4286, 91.4286, 4000, 920.0} // <- 14 tooth T2.5 belt + original extruder drive - - -#endif -#endif - - - // Defaults changed by the G10 command - #define X_EXTRUDER_OFFSET 0 #define Y_EXTRUDER_OFFSET 0 #define Z_EXTRUDER_OFFSET 0 @@ -375,7 +233,6 @@ #define ABS_TEMP 250 #define DEFAULT_TEMP PLA_TEMP - #define DEFAULT_ACCELERATION 1000 // X, Y, Z and E max acceleration in mm/s^2 for printing moves #define DEFAULT_RETRACT_ACCELERATION 1000 // X, Y, Z and E max acceleration in mm/s^2 for r retracts
--- a/Configuration_adv.h Thu Jul 07 12:23:34 2016 +0200 +++ b/Configuration_adv.h Fri Nov 17 10:13:31 2017 +0100 @@ -4,8 +4,6 @@ //=========================================================================== //=============================Thermal Settings ============================ //=========================================================================== - - #define BED_CHECK_INTERVAL 5000 //ms @@ -32,9 +30,9 @@ // This defines the number of extruders #ifdef REPRAPPRO_MULTIMATERIALS -#define EXTRUDERS 3 + #define EXTRUDERS 3 #else -#define EXTRUDERS 1 + #define EXTRUDERS 1 #endif #define Z_INCREMENT .0040 //Probe Movement Increment - 1 Full step on Huxley = 1/250 @@ -45,9 +43,9 @@ //#define Z_LATE_ENABLE // Enable Z the last moment. Needed if your Z driver overheats. //homing hits the endstop, then retracts by this distance, before it tries to slowly bump again: -#define X_HOME_RETRACT_MM 10 -#define Y_HOME_RETRACT_MM 10 -#define Z_HOME_RETRACT_MM 2 +#define X_HOME_RETRACT_MM 2 +#define Y_HOME_RETRACT_MM 2 +#define Z_HOME_RETRACT_MM 1.5 #define AXIS_RELATIVE_MODES {false, false, false, false} @@ -63,7 +61,7 @@ #define DEFAULT_MINSEGMENTTIME 20000 // Obsolete delete this // If defined the movements slow down when the look ahead buffer is only half full -#define SLOWDOWN +// #define SLOWDOWN // Frequency limit // See nophead's blog for more info @@ -122,11 +120,12 @@ // The number of linear motions that can be in the plan at any give time. // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2, i.g. 8,16,32 because shifts and ors are used to do the ringbuffering. #if defined SDSUPPORT - #define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller -// Chuck size for fast sd transfer - #define SD_FAST_XFER_CHUNK_SIZE 1024 + //#define BLOCK_BUFFER_SIZE 16 // SD,LCD,Buttons take more memory, block buffer needs to be smaller + #define BLOCK_BUFFER_SIZE 32 // SD,LCD,Buttons take more memory, block buffer needs to be smaller + // Chuck size for fast sd transfer + #define SD_FAST_XFER_CHUNK_SIZE 1024 #else - #define BLOCK_BUFFER_SIZE 16 // maximize block buffer + #define BLOCK_BUFFER_SIZE 64 // maximize block buffer #endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Configuration_huxley.h Fri Nov 17 10:13:31 2017 +0100 @@ -0,0 +1,36 @@ +// Bed thermistor: VISHAY BC COMPONENTS NTCS0603E3104FXT - All Huxleys with heated bed PCB +#define BED_BETA 4100.0 +#define BED_NTC 100000.0 + +// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Huxleys before 25/2/14 +// #define E_BETA 3960.0 +// #define E_NTC 100000.0 + +// Extruder thermistor: Digikey 480-3137-ND - All Huxleys shipped after 25/2/14 +#define E_BETA 4138.0 +#define E_NTC 100000.0 + + +#define AXES_MAX_LENGTHS {155, 150, 90} +#define INVERT_X_DIR false // 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 false // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false + + +#define X_MAX_LENGTH 155 +#define Y_MAX_LENGTH 150 +#define Z_MAX_LENGTH 90 +#define HOMING_FEEDRATE {10*60, 10*60, 1*60, 0} // set the homing speeds (mm/min) +#define FAST_HOME_FEEDRATE {80*60, 80*60, 4*60, 0} // set the homing speeds (mm/min) +#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) +#define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (mm/sec) +#define DEFAULT_MAX_ACCELERATION {1000,1000,50,250} // X, Y, Z, E maximum start speed for accelerated moves. E default values + +// X, Y, Z, E steps per mm + +#define DEFAULT_AXIS_STEPS_PER_UNIT {87.489, 87.489, 4000, 660.0} // <- 18-tooth aluminium pulley +//#define DEFAULT_AXIS_STEPS_PER_UNIT {92.635, 92.635, 4000, 660} // <- 17-tooth printed pulley +//#define DEFAULT_AXIS_STEPS_PER_UNIT {91.4286, 91.4286, 4000, 920.0} // <- 14 tooth T2.5 belt + original extruder drive
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Configuration_mendel.h Fri Nov 17 10:13:31 2017 +0100 @@ -0,0 +1,30 @@ +// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Mendels before 1/4/13 +#define E_BETA 3960.0 +#define E_NTC 100000.0 + +// Bed thermistor: RS 484-0149; EPCOS B57550G103J - All Mendels before 1/4/13 +#define BED_BETA 3480.0 +#define BED_NTC 10000.0 + + +#define AXES_MAX_LENGTHS {210, 210, 140} +#define INVERT_X_DIR false // for Mendel set to false, for Orca set to true +//#define INVERT_Y_DIR true // for Mendel set to true, for Orca set to false +#define INVERT_Y_DIR false // for Mendel set to true, for Orca set to false +#define INVERT_Z_DIR false // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false + +#define X_MAX_LENGTH 210 +#define Y_MAX_LENGTH 210 +#define Z_MAX_LENGTH 110 +#define HOMING_FEEDRATE {10*60, 10*60, 1*60, 0} // set the homing speeds (mm/min) +#define FAST_HOME_FEEDRATE {50*60, 50*60, 1*60, 0} // set the homing speeds (mm/min) +#define DEFAULT_MAX_FEEDRATE {500, 500, 3, 45} +#define DEFAULT_MAX_FEEDRATE {300, 300, 3, 45} // (mm/sec) +#define DEFAULT_MAX_ACCELERATION {800,800,30,250} // X, Y, Z, E maximum start speed for accelerated moves. E default values + +// X, Y, Z, E steps per mm + +#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 91.4286, 4000, 950.0} // <- 14 tooth T2.5 belt + original extruder drive
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Configuration_mendel2.h Fri Nov 17 10:13:31 2017 +0100 @@ -0,0 +1,35 @@ +// Bed thermistor: Rapid 61-0446 ; Semitec 103GT-2 - All Mendel2 shipped after 1/4/13 (launch) +// #define BED_BETA 4126.0 +// #define BED_NTC 10000.0 + +// Bed thermistor: Farnell 1299930 ; EPCOS B57863S103F040 - All Mendel2 shipped after 29/5/14 + #define BED_BETA 3988.0 + #define BED_NTC 10000.0 + +// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Mendel2 shipped after 1/4/13 (launch) +// #define E_BETA 3960.0 +// #define E_NTC 100000.0 + +// Extruder thermistor: Digikey 480-3137-ND - All Mendels shipped after 25/2/14 +#define E_BETA 4138.0 +#define E_NTC 100000.0 + +#define AXES_MAX_LENGTHS {210, 210, 140} +#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 false // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false + +#define X_MAX_LENGTH 210 +#define Y_MAX_LENGTH 210 +#define Z_MAX_LENGTH 110 +#define HOMING_FEEDRATE {10*60, 10*60, 1*60, 0} // set the homing speeds (mm/min) +#define FAST_HOME_FEEDRATE {50*60, 50*60, 1*60, 0} // set the homing speeds (mm/min) + +#define DEFAULT_MAX_FEEDRATE {300, 300, 3, 45} // (mm/sec) +#define DEFAULT_MAX_ACCELERATION {1000,1000,30,250} // X, Y, Z, E maximum start speed for accelerated moves. E default values + +// X, Y, Z, E steps per mm +#define DEFAULT_AXIS_STEPS_PER_UNIT {92.635, 92.635, 4000, 660} // <- 17-tooth printed pulley
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Configuration_neosoft_mendel.h Fri Nov 17 10:13:31 2017 +0100 @@ -0,0 +1,56 @@ +// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Mendels before 1/4/13 +//#define E_BETA 3960.0 +//#define E_NTC 100000.0 + +// Bed thermistor: RS 484-0149; EPCOS B57550G103J - All Mendels before 1/4/13 +//#define BED_BETA 3480.0 +//#define BED_NTC 10000.0 + +// Bed thermistor: Rapid 61-0446 ; Semitec 103GT-2 - All Mendel2 shipped after 1/4/13 (launch) +// #define BED_BETA 4126.0 +// #define BED_NTC 10000.0 + +// Bed thermistor: Farnell 1299930 ; EPCOS B57863S103F040 - All Mendel2 shipped after 29/5/14 +//*** #define BED_BETA 3988.0 +//*** #define BED_NTC 10000.0 + +// Extruder thermistor: RS 198-961 100k ohm 10% DO-35 NTC thermistor - All Mendel2 shipped after 1/4/13 (launch) +// #define E_BETA 3960.0 +// #define E_NTC 100000.0 + +// Extruder thermistor: Digikey 480-3137-ND - All Mendels shipped after 25/2/14 +//*** #define E_BETA 4138.0 +//*** #define E_NTC 100000.0 + +#define BED_BETA 4200.0 +#define BED_NTC 10000.0 +#define E_BETA 4200.0 +#define E_NTC 100000.0 + +#define AXES_MAX_LENGTHS {250, 200, 110} +#define X_MAX_LENGTH 250 +#define Y_MAX_LENGTH 200 +#define Z_MAX_LENGTH 110 + +#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 false // for Mendel set to false, for Orca set to true +#define INVERT_E0_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E1_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false +#define INVERT_E2_DIR true // for direct drive extruder v9 set to true, for geared extruder set to false + +#define HOMING_FEEDRATE {15*60, 15*60, 3*60, 0} // set the homing speeds (mm/min) +#define FAST_HOME_FEEDRATE {60*60, 60*60, 6*60, 0} // set the homing speeds (mm/min) + +#define DEFAULT_MAX_FEEDRATE {200, 200, 6, 120} // (mm/sec) +#define DEFAULT_MAX_ACCELERATION {1000,1000,50,500} // X, Y, Z, E maximum start speed for accelerated moves. E default values + +// X, Y, Z, E steps per mm +// 80: 18 tooth aluminium pulley +// 92.635: 17 tooth printed original pulley +// 4000: standard M5 Z Axis +// 950: reprap printed extruder +// 475: bulldog XL extruder +// 2133.333:TR 5x1.5 z axis + +#define DEFAULT_AXIS_STEPS_PER_UNIT {80, 91.429, 2133.333, 475.0} // <- 18-tooth aluminium pulley
--- a/Marlin.ino Thu Jul 07 12:23:34 2016 +0200 +++ b/Marlin.ino Fri Nov 17 10:13:31 2017 +0100 @@ -74,7 +74,7 @@ #include "pins_arduino.h" #include "slave_comms.h" -#define VERSION_STRING "1.0.2 RRP/NeoSoft" +#define VERSION_STRING "1.0.2 RRP/NeoSoft\nModified for ERFH - Engraving Robot From Hell" // look here for descriptions of gcodes: http://linuxcnc.org/handbook/gcode/g-code.html // http://objects.reprap.org/wiki/Mendel_User_Manual:_RepRapGCodes @@ -1506,6 +1506,8 @@ WRITE(M571_PIN, LOW);// M571 disable in any case! + if (!(code_seen('S') || code_seen('E'))) { + // only output to console when calles without parameters SERIAL_ECHO_START; SERIAL_ECHO("Parameters: S<0|1> enable extruder active pin, E<0|1> if enabled prevent real drive movement"); @@ -1524,7 +1526,7 @@ } else { SERIAL_ECHOLN("disabled"); } - + } break;
