From 3eafea840d61b42d0697f6c445516a20ced1fec2 Mon Sep 17 00:00:00 2001 From: chrono Date: Sun, 1 Mar 2015 11:04:02 +0100 Subject: [PATCH] Minor fixes in Configuration.h --- Marlin/Configuration.h | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d0931084e..12240a301 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -70,7 +70,7 @@ Here are some standard links for getting your machine calibrated: // #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" // This defines the number of extruders -#define EXTRUDERS 1 +#define EXTRUDERS 2 //// The following define selects which power supply you have. Please choose the one that matches your setup // 1 = ATX @@ -134,7 +134,7 @@ Here are some standard links for getting your machine calibrated: #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 // Actual temperature must be close to target for this long before M109 returns success -#define TEMP_RESIDENCY_TIME 10 // (seconds) +#define TEMP_RESIDENCY_TIME 15 // (seconds) #define TEMP_HYSTERESIS 3 // (degC) range of +/- temperatures considered "close" to the target one #define TEMP_WINDOW 1 // (degC) Window around target to start the residency timer x degC early. @@ -186,21 +186,11 @@ Here are some standard links for getting your machine calibrated: #define K1 0.95 //smoothing factor within the PID #define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine -// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it -// Felix 2.0+ electronics with v4 Hotend -#define DEFAULT_Kp 12 -#define DEFAULT_Ki 0.84 -#define DEFAULT_Kd 85 + // Felix 2.0+ electronics with v4 Hotend + #define DEFAULT_Kp 12 + #define DEFAULT_Ki 0.84 + #define DEFAULT_Kd 85 -// MakerGear -// #define DEFAULT_Kp 7.0 -// #define DEFAULT_Ki 0.1 -// #define DEFAULT_Kd 12 - -// Mendel Parts V9 on 12V -// #define DEFAULT_Kp 63.0 -// #define DEFAULT_Ki 2.25 -// #define DEFAULT_Kd 440 #endif // PIDTEMP //=========================================================================== @@ -783,7 +773,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define TEMP_STAT_LEDS // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency -// which is not ass annoying as with the hardware PWM. On the other hand, if this frequency +// which is not as annoying as with the hardware PWM. On the other hand, if this frequency // is too low, you should also increment SOFT_PWM_SCALE. //#define FAN_SOFT_PWM @@ -857,12 +847,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of //#define FILAMENT_LCD_DISPLAY - - - - #include "Configuration_adv.h" #include "thermistortables.h" #endif //__CONFIGURATION_H -