Explorar el Código

Merge pull request #2185 from jothan/bed_integral

Separate the maximum integral power for the bed from PID_INTEGRAL_DRI…
Scott Lahteine hace 10 años
padre
commit
5824f613ff

+ 2
- 0
Marlin/Configuration.h Ver fichero

@@ -243,6 +243,8 @@ Here are some standard links for getting your machine calibrated:
243 243
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
244 244
 
245 245
 #ifdef PIDTEMPBED
246
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
247
+
246 248
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
247 249
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
248 250
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/Felix/Configuration.h Ver fichero

@@ -217,6 +217,8 @@ Here are some standard links for getting your machine calibrated:
217 217
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
218 218
 
219 219
 #ifdef PIDTEMPBED
220
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
221
+
220 222
 // Felix Foil Heater
221 223
    #define DEFAULT_bedKp 103.37
222 224
    #define DEFAULT_bedKi 2.79

+ 2
- 0
Marlin/example_configurations/Hephestos/Configuration.h Ver fichero

@@ -234,6 +234,8 @@ Here are some standard links for getting your machine calibrated:
234 234
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
235 235
 
236 236
 #ifdef PIDTEMPBED
237
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
238
+
237 239
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
238 240
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
239 241
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/K8200/Configuration.h Ver fichero

@@ -253,6 +253,8 @@ Here are some standard links for getting your machine calibrated:
253 253
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
254 254
 
255 255
 #ifdef PIDTEMPBED
256
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
257
+
256 258
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
257 259
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
258 260
 //    #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h Ver fichero

@@ -243,6 +243,8 @@ Here are some standard links for getting your machine calibrated:
243 243
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
244 244
 
245 245
 #ifdef PIDTEMPBED
246
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
247
+
246 248
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
247 249
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
248 250
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/SCARA/Configuration.h Ver fichero

@@ -256,6 +256,8 @@ Here are some standard links for getting your machine calibrated:
256 256
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
257 257
 
258 258
 #ifdef PIDTEMPBED
259
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
260
+
259 261
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260 262
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
261 263
 //    #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/WITBOX/Configuration.h Ver fichero

@@ -233,6 +233,8 @@ Here are some standard links for getting your machine calibrated:
233 233
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
234 234
 
235 235
 #ifdef PIDTEMPBED
236
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
237
+
236 238
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
237 239
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
238 240
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/delta/biv2.5/Configuration.h Ver fichero

@@ -260,6 +260,8 @@ Here are some standard links for getting your machine calibrated:
260 260
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
261 261
 
262 262
 #ifdef PIDTEMPBED
263
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
264
+
263 265
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
264 266
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
265 267
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/delta/generic/Configuration.h Ver fichero

@@ -260,6 +260,8 @@ Here are some standard links for getting your machine calibrated:
260 260
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
261 261
 
262 262
 #ifdef PIDTEMPBED
263
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
264
+
263 265
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
264 266
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
265 267
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/delta/kossel_mini/Configuration.h Ver fichero

@@ -260,6 +260,8 @@ Here are some standard links for getting your machine calibrated:
260 260
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
261 261
 
262 262
 #ifdef PIDTEMPBED
263
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
264
+
263 265
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
264 266
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
265 267
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/delta/kossel_pro/Configuration.h Ver fichero

@@ -256,6 +256,8 @@ Here are some standard links for getting your machine calibrated:
256 256
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
257 257
 
258 258
 #ifdef PIDTEMPBED
259
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
260
+
259 261
 //Kossel Pro heated bed plate with borosilicate glass
260 262
 //from pidautotune (M303 E-1 S60 C8)
261 263
     #define  DEFAULT_bedKp 370.25

+ 2
- 0
Marlin/example_configurations/makibox/Configuration.h Ver fichero

@@ -230,6 +230,8 @@ Here are some standard links for getting your machine calibrated:
230 230
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
231 231
 
232 232
 #ifdef PIDTEMPBED
233
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
234
+
233 235
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
234 236
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
235 237
     #define  DEFAULT_bedKp 10.00

+ 2
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h Ver fichero

@@ -232,6 +232,8 @@ Here are some standard links for getting your machine calibrated:
232 232
 //#define PID_BED_DEBUG // Sends debug data to the serial port.
233 233
 
234 234
 #ifdef PIDTEMPBED
235
+    #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
236
+
235 237
 //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
236 238
 //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
237 239
     #define  DEFAULT_bedKp 10.00

+ 2
- 2
Marlin/temperature.cpp Ver fichero

@@ -361,7 +361,7 @@ void updatePID() {
361 361
     }
362 362
   #endif
363 363
   #ifdef PIDTEMPBED
364
-    temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
364
+    temp_iState_max_bed = PID_BED_INTEGRAL_DRIVE_MAX / bedKi;
365 365
   #endif
366 366
 }
367 367
 
@@ -844,7 +844,7 @@ void tp_init() {
844 844
     #endif //PIDTEMP
845 845
     #ifdef PIDTEMPBED
846 846
       temp_iState_min_bed = 0.0;
847
-      temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;
847
+      temp_iState_max_bed = PID_BED_INTEGRAL_DRIVE_MAX / bedKi;
848 848
     #endif //PIDTEMPBED
849 849
   }
850 850
 

Loading…
Cancelar
Guardar