Browse Source

Minor fixes in Configuration.h

chrono 10 years ago
parent
commit
3eafea840d
1 changed files with 8 additions and 23 deletions
  1. 8
    23
      Marlin/Configuration.h

+ 8
- 23
Marlin/Configuration.h View File

70
 // #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
70
 // #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
71
 
71
 
72
 // This defines the number of extruders
72
 // This defines the number of extruders
73
-#define EXTRUDERS 1
73
+#define EXTRUDERS 2
74
 
74
 
75
 //// The following define selects which power supply you have. Please choose the one that matches your setup
75
 //// The following define selects which power supply you have. Please choose the one that matches your setup
76
 // 1 = ATX
76
 // 1 = ATX
134
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
134
 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
135
 
135
 
136
 // Actual temperature must be close to target for this long before M109 returns success
136
 // Actual temperature must be close to target for this long before M109 returns success
137
-#define TEMP_RESIDENCY_TIME 10  // (seconds)
137
+#define TEMP_RESIDENCY_TIME 15  // (seconds)
138
 #define TEMP_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
138
 #define TEMP_HYSTERESIS 3       // (degC) range of +/- temperatures considered "close" to the target one
139
 #define TEMP_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
139
 #define TEMP_WINDOW     1       // (degC) Window around target to start the residency timer x degC early.
140
 
140
 
186
   #define K1 0.95 //smoothing factor within the PID
186
   #define K1 0.95 //smoothing factor within the PID
187
   #define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
187
   #define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine
188
 
188
 
189
-// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
190
-// Felix 2.0+ electronics with v4 Hotend
191
-#define DEFAULT_Kp 12
192
-#define DEFAULT_Ki 0.84
193
-#define DEFAULT_Kd 85
194
-
195
-// MakerGear
196
-//    #define  DEFAULT_Kp 7.0
197
-//    #define  DEFAULT_Ki 0.1
198
-//    #define  DEFAULT_Kd 12
199
-
200
-// Mendel Parts V9 on 12V
201
-//    #define  DEFAULT_Kp 63.0
202
-//    #define  DEFAULT_Ki 2.25
203
-//    #define  DEFAULT_Kd 440
189
+  // Felix 2.0+ electronics with v4 Hotend
190
+  #define DEFAULT_Kp 12
191
+  #define DEFAULT_Ki 0.84
192
+  #define DEFAULT_Kd 85
193
+
204
 #endif // PIDTEMP
194
 #endif // PIDTEMP
205
 
195
 
206
 //===========================================================================
196
 //===========================================================================
783
 //#define TEMP_STAT_LEDS
773
 //#define TEMP_STAT_LEDS
784
 
774
 
785
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
775
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
786
-// which is not ass annoying as with the hardware PWM. On the other hand, if this frequency
776
+// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
787
 // is too low, you should also increment SOFT_PWM_SCALE.
777
 // is too low, you should also increment SOFT_PWM_SCALE.
788
 //#define FAN_SOFT_PWM
778
 //#define FAN_SOFT_PWM
789
 
779
 
857
 //#define FILAMENT_LCD_DISPLAY
847
 //#define FILAMENT_LCD_DISPLAY
858
 
848
 
859
 
849
 
860
-
861
-
862
-
863
-
864
 #include "Configuration_adv.h"
850
 #include "Configuration_adv.h"
865
 #include "thermistortables.h"
851
 #include "thermistortables.h"
866
 
852
 
867
 #endif //__CONFIGURATION_H
853
 #endif //__CONFIGURATION_H
868
-

Loading…
Cancel
Save