From dbc8f88e73f2223bc792d8d1e883b7404bab8896 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 28 Jul 2012 19:44:11 +0000 Subject: [PATCH] settings --- Marlin/Configuration.h | 58 +++--- Marlin/Makefile | 2 +- Marlin/reprappro--Configuration.h | 326 ++++++++++++++++++++++++++++++ 3 files changed, 359 insertions(+), 27 deletions(-) create mode 100644 Marlin/reprappro--Configuration.h diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1248029..26ea950 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -8,8 +8,8 @@ //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 "2012-05-02" //Personal revision number for changes to THIS file. -#define STRING_CONFIG_H_AUTHOR "erik" //Who made the changes. +#define STRING_VERSION_CONFIG_H "2012-07-28" //Personal revision number for changes to THIS file. +#define STRING_CONFIG_H_AUTHOR "iwj" //Who made the changes. // This determines the communication speed of the printer #define BAUDRATE 250000 @@ -32,7 +32,7 @@ // Gen3+ =9 #ifndef MOTHERBOARD -#define MOTHERBOARD 7 +#define MOTHERBOARD 62 #endif @@ -61,10 +61,10 @@ // 52 is 200k thermistor - ATC Semitec 204GT-2 (1k pullup) // 55 is 100k thermistor - ATC Semitec 104GT-2 (Used in ParCan) (1k pullup) -#define TEMP_SENSOR_0 -1 +#define TEMP_SENSOR_0 102 #define TEMP_SENSOR_1 0 #define TEMP_SENSOR_2 0 -#define TEMP_SENSOR_BED 0 +#define TEMP_SENSOR_BED 101 // Actual temperature must be close to target for this long before M109 returns success #define TEMP_RESIDENCY_TIME 10 // (seconds) @@ -101,9 +101,14 @@ // If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it // Ultimaker - #define DEFAULT_Kp 22.2 - #define DEFAULT_Ki 1.08 - #define DEFAULT_Kd 114 +// #define DEFAULT_Kp 22.2 +// #define DEFAULT_Ki 1.08 +// #define DEFAULT_Kd 114 + +// RepRapPro Huxley + Mendel + #define DEFAULT_Kp 12.0 + #define DEFAULT_Ki (2.2*PID_dT) + #define DEFAULT_Kd (80/PID_dT) // Makergear // #define DEFAULT_Kp 7.0 @@ -155,9 +160,9 @@ #endif // The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins. -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. +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. //#define DISABLE_MAX_ENDSTOPS // For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 @@ -169,15 +174,15 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th // Disables axis when it's not being used. #define DISABLE_X false #define DISABLE_Y false -#define DISABLE_Z false +#define DISABLE_Z true #define DISABLE_E false // For all extruders #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 -#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 +#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 // ENDSTOP SETTINGS: // Sets direction of endstops when homing; 1=MAX, -1=MIN @@ -188,11 +193,11 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th #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 -#define X_MAX_POS 205 +#define X_MAX_POS 155 #define X_MIN_POS 0 -#define Y_MAX_POS 205 +#define Y_MAX_POS 150 #define Y_MIN_POS 0 -#define Z_MAX_POS 200 +#define Z_MAX_POS 90 #define Z_MIN_POS 0 #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS) @@ -210,17 +215,18 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th // default settings -#define DEFAULT_AXIS_STEPS_PER_UNIT {78.7402,78.7402,200*8/3,760*1.1} // default steps per unit for ultimaker +#define DEFAULT_AXIS_STEPS_PER_UNIT {91.4286, 91.4286,4000,875} // default steps per unit for ultimaker + // [not really?? found in reprappro config, unconditional] #define DEFAULT_MAX_FEEDRATE {500, 500, 5, 45} // (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. +#define DEFAULT_MAX_ACCELERATION {1000,1000,50,250} // 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. -#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 r retracts +#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 // -#define DEFAULT_XYJERK 20.0 // (mm/sec) +#define DEFAULT_XYJERK 15.0 // (mm/sec) #define DEFAULT_ZJERK 0.4 // (mm/sec) -#define DEFAULT_EJERK 5.0 // (mm/sec) +#define DEFAULT_EJERK 15.0 // (mm/sec) //=========================================================================== //=============================Additional Features=========================== @@ -275,7 +281,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th #endif // Increase the FAN pwm frequency. Removes the PWM noise but increases heating in the FET/Arduino -#define FAST_PWM_FAN +//#define FAST_PWM_FAN // M240 Triggers a camera by emulating a Canon RC-1 Remote // Data from: http://www.doc-diy.net/photo/rc-1_hacked/ diff --git a/Marlin/Makefile b/Marlin/Makefile index fe77a2a..9aae151 100644 --- a/Marlin/Makefile +++ b/Marlin/Makefile @@ -44,7 +44,7 @@ MCU = atmega644p # Here you select "arduino", "Sanguino", "Gen7", ... HARDWARE_VARIANT = Sanguino # This defined the board you are compiling for -HARDWARE_MOTHERBOARD = 91 +HARDWARE_MOTHERBOARD = 62 # Arduino source install directory INSTALL_DIR = ../../arduino-0022 diff --git a/Marlin/reprappro--Configuration.h b/Marlin/reprappro--Configuration.h new file mode 100644 index 0000000..652b7f0 --- /dev/null +++ b/Marlin/reprappro--Configuration.h @@ -0,0 +1,326 @@ +#ifndef CONFIGURATION_H +#define CONFIGURATION_H + +// Uncomment ONE of the next three lines - the one for your RepRap machine +#define REPRAPPRO_HUXLEY +//#define REPRAPPRO_MENDEL +//#define REPRAPPRO_WALLACE + +#ifndef REPRAPPRO_HUXLEY +#ifndef REPRAPPRO_MENDEL +#ifndef REPRAPPRO_WALLACE +#error Uncomment one of #define REPRAPPRO_HUXLEY, REPRAPPRO_MENDEL or REPRAPPRO_WALLACE at the start of the file Configuration.h +#endif +#endif +#endif + +// Uncomment this if you are experimenting, know what you are doing, and want to switch off some safety +// features, e.g. allow extrude at low temperature etc. +//#define DEVELOPING + +// This configurtion file contains the basic settings. +// Advanced settings can be found in Configuration_adv.h +// BASIC SETTINGS: select your board type, temperature sensor type, axis scaling, and endstop configuration + +//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 "2012-06-25-1" //Personal revision number for changes to THIS file. +#define STRING_CONFIG_H_AUTHOR "RepRapPro" //Who made the changes. + +// This determines the communication speed of the printer +#define BAUDRATE 250000 +//#define BAUDRATE 115200 + +//// The following define selects which electronics board you have. Please choose the one that matches your setup +// Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics" +// Gen7 v1.1, v1.2 = 11 +// Gen7 v1.3 = 12 +// Gen7 v1.4 = 13 +// MEGA/RAMPS up to 1.2 = 3 +// RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan) +// RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed) +// Gen6 = 5 +// Gen6 deluxe = 51 +// Sanguinololu 1.2 and above = 62 +// Melzi 63 +// Ultimaker = 7 +// Teensylu = 8 +// Gen3+ =9 +#define MOTHERBOARD 62 + +//=========================================================================== +//=============================Thermal Settings ============================ +//=========================================================================== + +// Set this if you want to define the constants in the thermistor circuit +// and work out temperatures algebraically - added by AB. +//#define COMPUTE_THERMISTORS + +#ifdef COMPUTE_THERMISTORS + +// See http://en.wikipedia.org/wiki/Thermistor#B_or_.CE.B2_parameter_equation + +// BETA is the B value +// RS is the value of the series resistor in ohms +// R_INF is R0.exp(-BETA/T0), where R0 is the thermistor resistance at T0 (T0 is in kelvin) +// Normally T0 is 298.15K (25 C). If you write that expression in brackets in the #define the compiler +// should compute it for you (i.e. it won't need to be calculated at run time). + +// If the A->D converter has a range of 0..1023 and the measured voltage is V (between 0 and 1023) +// then the thermistor resistance, R = V.RS/(1023 - V) +// and the temperature, T = BETA/ln(R/R_INF) +// To get degrees celsius (instead of kelvin) add -273.15 to T + +// This DOES assume that all extruders use the same thermistor type. + +#define ABS_ZERO -273.15 +#define AD_RANGE 16383 + +// RS 198-961 +#define E_BETA 3960.0 +#define E_RS 4700.0 +#define E_R_INF ( 100000.0*exp(-E_BETA/298.15) ) + +// RS 484-0149; EPCOS B57550G103J +#define BED_BETA 3480.0 +#define BED_RS 4700.0 +#define BED_R_INF ( 10000.0*exp(-BED_BETA/298.15) ) + +#define BED_USES_THERMISTOR +#define HEATER_0_USES_THERMISTOR +//#define HEATER_1_USES_THERMISTOR +//#define HEATER_2_USES_THERMISTOR + +#endif + + + +//// Temperature sensor settings: +// -2 is thermocouple with MAX6675 (only for sensor 0) +// -1 is thermocouple with AD595 +// 0 is not used +// 1 is 100k thermistor - best choice for EPCOS 100k (4.7k pullup) +// 2 is 200k thermistor - ATC Semitec 204GT-2 (4.7k pullup) +// 3 is mendel-parts thermistor (4.7k pullup) +// 4 is 10k thermistor !! do not use it for a hotend. It gives bad resolution at high temp. !! +// 5 is ParCan supplied 104GT-2 100K +// 6 is EPCOS 100k +// 7 is 100k Honeywell thermistor 135-104LAG-J01 +// 100 is 100k GE Sensing AL03006-58.2K-97-G1 with r2=4k7 +// 101 is 100k 0603 SMD Vishay NTCS0603E3104FXT with r2=4k7 +// 102 is 100k EPCOS G57540 Nozzle with r2=4k7 +// 103 is 100k EPCOS G57540 Bed with r2=4k7 +// 104 is 10k G57540 Bed with r2=4k7 +// 105 is 10k G57540 Bed with r2=10k +// 110 is 100k RS thermistor 198-961 hot end with 10K resistor + +#define TEMP_SENSOR_0 102 +#define TEMP_SENSOR_1 0 +#define TEMP_SENSOR_2 0 +#define TEMP_SENSOR_BED 101 + +// Actual temperature must be close to target for this long before M109 returns success +#define TEMP_RESIDENCY_TIME 10 // (seconds) +#define TEMP_HYSTERESIS 5 // (C°) range of +/- temperatures considered "close" to the target one +#define TEMP_WINDOW 2 // (degC) Window around target to start the recidency timer x degC early. + +// The minimal temperature defines the temperature below which the heater will not be enabled It is used +// to check that the wiring to the thermistor is not broken. +// Otherwise this would lead to the heater being powered on all the time. +#define HEATER_0_MINTEMP 1 +//#define HEATER_1_MINTEMP 5 +//#define HEATER_2_MINTEMP 5 +#define BED_MINTEMP 1 + +// When temperature exceeds max temp, your heater will be switched off. +// This feature exists to protect your hotend from overheating accidentally, but *NOT* from thermistor short/failure! +// You should use MINTEMP for thermistor short/failure protection. +#define HEATER_0_MAXTEMP 399 +//#define HEATER_1_MAXTEMP 275 +//#define HEATER_2_MAXTEMP 275 +#define BED_MAXTEMP 150 + + +// PID settings: +// Comment the following line to disable PID and enable bang-bang. +#define PIDTEMP +#define PID_MAX 255 // limits current to nozzle; 255=full current +#define FULL_PID_BAND 150 // Full power is applied when pid_error[e] > FULL_PID_BAND +#ifdef PIDTEMP + //#define PID_DEBUG // Sends debug data to the serial port. + //#define PID_OPENLOOP 1 // Puts PID in open loop. M104 sets the output power in % + #define PID_INTEGRAL_DRIVE_MAX 125 //limit for the integral term + #define K1 0.95 //smoothing factor withing the PID + #define PID_dT 0.122 //sampling period of the PID + +// If you are using a preconfigured hotend then you can use one of the value sets by uncommenting it +// Ultimaker +// #define DEFAULT_Kp 22.2 +// #define DEFAULT_Ki (1.25*PID_dT) +// #define DEFAULT_Kd (99/PID_dT) + +// Makergear +// #define DEFAULT_Kp 7.0 +// #define DEFAULT_Ki 0.1 +// #define DEFAULT_Kd 12 + +// RepRapPro Huxley + Mendel + #define DEFAULT_Kp 12.0 + #define DEFAULT_Ki (2.2*PID_dT) + #define DEFAULT_Kd (80/PID_dT) + +// Mendel Parts V9 on 12V +// #define DEFAULT_Kp 63.0 +// #define DEFAULT_Ki (2.25*PID_dT) +// #define DEFAULT_Kd (440/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 (X_MAX_LENGTH+Y_MAX_LENGTH) //prevent extrusion of very large distances. +#endif + +//=========================================================================== +//=============================Mechanical Settings=========================== +//=========================================================================== + +// Endstop Settings +#define ENDSTOPPULLUPS // Comment this out (using // at the start of the line) to disable the endstop pullup resistors + +// The pullups are needed if you directly connect a mechanical endswitch between the signal and ground pins. +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. + +// For Inverting Stepper Enable Pins (Active Low) use 0, Non Inverting (Active High) use 1 +#define X_ENABLE_ON 0 +#define Y_ENABLE_ON 0 +#define Z_ENABLE_ON 0 +#define E_ENABLE_ON 0 // For all extruders + +// Disables axis when it's not being used. +#define DISABLE_X false +#define DISABLE_Y false +#define DISABLE_Z true +#define DISABLE_E false // For all extruders + +#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 + +// ENDSTOP SETTINGS: +// Sets direction of endstops when homing; 1=MAX, -1=MIN +#define X_HOME_DIR -1 +#define Y_HOME_DIR -1 +#define Z_HOME_DIR -1 + +#define min_software_endstops true //If true, axis won't move to coordinates less than zero. +#define max_software_endstops true //If true, axis won't move to coordinates greater than the defined lengths below. + +// The position of the homing switches. Use MAX_LENGTH * -0.5 if the center should be 0, 0, 0 +#define X_HOME_POS 0 +#define Y_HOME_POS 0 +#define Z_HOME_POS 0 + +//// MOVEMENT SETTINGS +#define NUM_AXIS 4 // The axis order in all axis related arrays is X, Y, Z, E + +#ifdef REPRAPPRO_MENDEL + +#define X_MAX_LENGTH 210 +#define Y_MAX_LENGTH 210 +#define Z_MAX_LENGTH 140 +#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 + +#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 + +#endif + + +// default settings + +#define DEFAULT_AXIS_STEPS_PER_UNIT {91.4286, 91.4286,4000,875} // default steps per unit for ultimaker + + +#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 + +// +#define DEFAULT_XYJERK 15.0 // (mm/sec) +#define DEFAULT_ZJERK 0.4 // (mm/sec) +#define DEFAULT_EJERK 15.0 // (mm/sec) + +//=========================================================================== +//=============================Additional Features=========================== +//=========================================================================== + +// EEPROM +// the microcontroller can store settings in the EEPROM, e.g. max velocity... +// M500 - stores paramters in EEPROM +// M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily). +// M502 - reverts to the default "factory settings". You still need to store them in EEPROM afterwards if you want to. +//define this to enable eeprom support +#define EEPROM_SETTINGS +//to disable EEPROM Serial responses and decrease program space by ~1700 byte: comment this out: +// please keep turned on if you can. +#define EEPROM_CHITCHAT + +//LCD and SD support +//#define ULTRA_LCD //general lcd support, also 16x2 +#define SDSUPPORT // Enable SD Card Support in Hardware Console + +//#define ULTIPANEL +#ifdef ULTIPANEL + //#define NEWPANEL //enable this if you have a click-encoder panel + #define SDSUPPORT + #define ULTRA_LCD + #define LCD_WIDTH 20 + #define LCD_HEIGHT 4 + +// Preheat Constants + #define PLA_PREHEAT_HOTEND_TEMP 180 + #define PLA_PREHEAT_HPB_TEMP 70 + #define PLA_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 + + #define ABS_PREHEAT_HOTEND_TEMP 240 + #define ABS_PREHEAT_HPB_TEMP 100 + #define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255 + +#else //no panel but just lcd + #ifdef ULTRA_LCD + #define LCD_WIDTH 16 + #define LCD_HEIGHT 2 + #endif +#endif + +// Enable uM-FPU support: +#define UMFPUSUPPORT 1 + +// M240 Triggers a camera by emulating a Canon RC-1 Remote +// Data from: http://www.doc-diy.net/photo/rc-1_hacked/ +// #define PHOTOGRAPH_PIN 23 + +#include "Configuration_adv.h" +#include "thermistortables.h" + +#endif //__CONFIGURATION_H -- 2.30.2