Browse Source

Testing Fix for Arduino 1.6+ compiler issue #1523

chrono 10 years ago
parent
commit
fb75a9272d
2 changed files with 351 additions and 357 deletions
  1. 9
    16
      Marlin/Configuration.h
  2. 342
    341
      Marlin/temperature.cpp

+ 9
- 16
Marlin/Configuration.h View File

215
 // If your configuration is significantly different than this and you don't understand the issues involved, you probably
215
 // If your configuration is significantly different than this and you don't understand the issues involved, you probably
216
 // shouldn't use bed PID until someone else verifies your hardware works.
216
 // shouldn't use bed PID until someone else verifies your hardware works.
217
 // If this is enabled, find your own PID constants below.
217
 // If this is enabled, find your own PID constants below.
218
-//#define PIDTEMPBED
218
+#define PIDTEMPBED
219
 //
219
 //
220
 //#define BED_LIMIT_SWITCHING
220
 //#define BED_LIMIT_SWITCHING
221
 
221
 
226
 #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
226
 #define MAX_BED_POWER 255 // limits duty cycle to bed; 255=full current
227
 
227
 
228
 #ifdef PIDTEMPBED
228
 #ifdef PIDTEMPBED
229
-//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
230
-//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
231
-    #define  DEFAULT_bedKp 10.00
232
-    #define  DEFAULT_bedKi .023
233
-    #define  DEFAULT_bedKd 305.4
234
-
235
-//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
236
-//from pidautotune
237
-//    #define  DEFAULT_bedKp 97.1
238
-//    #define  DEFAULT_bedKi 1.41
239
-//    #define  DEFAULT_bedKd 1675.16
229
+// Felix Foil Heater
230
+   #define DEFAULT_bedKp 103.37
231
+   #define DEFAULT_bedKi 2.79
232
+   #define DEFAULT_bedKd 956.94
240
 
233
 
241
 // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
234
 // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
242
 #endif // PIDTEMPBED
235
 #endif // PIDTEMPBED
280
 // uncomment the 2 defines below:
273
 // uncomment the 2 defines below:
281
 
274
 
282
 // Parameters for all extruder heaters
275
 // Parameters for all extruder heaters
283
-//#define THERMAL_RUNAWAY_PROTECTION_PERIOD 40 //in seconds
284
-//#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS 4 // in degree Celsius
276
+#define THERMAL_RUNAWAY_PROTECTION_PERIOD 60 //in seconds
277
+#define THERMAL_RUNAWAY_PROTECTION_HYSTERESIS 5 // in degree Celsius
285
 
278
 
286
 // If you want to enable this feature for your bed heater,
279
 // If you want to enable this feature for your bed heater,
287
 // uncomment the 2 defines below:
280
 // uncomment the 2 defines below:
288
 
281
 
289
 // Parameters for the bed heater
282
 // Parameters for the bed heater
290
-//#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD 20 //in seconds
291
-//#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS 2 // in degree Celsius
283
+#define THERMAL_RUNAWAY_PROTECTION_BED_PERIOD 30 //in seconds
284
+#define THERMAL_RUNAWAY_PROTECTION_BED_HYSTERESIS 5// in degree Celsius
292
 
285
 
293
 
286
 
294
 //===========================================================================
287
 //===========================================================================

+ 342
- 341
Marlin/temperature.cpp
File diff suppressed because it is too large
View File


Loading…
Cancel
Save