thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Remove PID examples from preconfigured configs

Scott Lahteine 10 years ago
parent
7456710a1f
commit
de25a48dec
9 changed files with 33 additions and 183 deletions
Unified View Show Diff Stats
  1. 16
    15
      Marlin/configurator/config/Configuration.h
  2. 1
    17
      Marlin/example_configurations/Hephestos/Configuration.h
  3. 0
    28
      Marlin/example_configurations/K8200/Configuration.h
  4. 0
    16
      Marlin/example_configurations/RigidBot/Configuration.h
  5. 0
    33
      Marlin/example_configurations/SCARA/Configuration.h
  6. 0
    16
      Marlin/example_configurations/WITBOX/Configuration.h
  7. 16
    15
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  8. 0
    28
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  9. 0
    15
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

+ 16
- 15
Marlin/configurator/config/Configuration.h View File

205 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 205 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
206 
   #define K1 0.95 //smoothing factor within the PID
 206 
   #define K1 0.95 //smoothing factor within the PID
207
207
208 
-// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209 
-// Ultimaker
210 
-    #define  DEFAULT_Kp 22.2
211 
-    #define  DEFAULT_Ki 1.08
212 
-    #define  DEFAULT_Kd 114
213 
-
214 
-// MakerGear
215 
-//    #define  DEFAULT_Kp 7.0
216 
-//    #define  DEFAULT_Ki 0.1
217 
-//    #define  DEFAULT_Kd 12
218 
-
219 
-// Mendel Parts V9 on 12V
220 
-//    #define  DEFAULT_Kp 63.0
221 
-//    #define  DEFAULT_Ki 2.25
222 
-//    #define  DEFAULT_Kd 440
208 
+  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209 
+  // Ultimaker
210 
+  #define  DEFAULT_Kp 22.2
211 
+  #define  DEFAULT_Ki 1.08
212 
+  #define  DEFAULT_Kd 114
213 
+
214 
+  // MakerGear
215 
+  //#define  DEFAULT_Kp 7.0
216 
+  //#define  DEFAULT_Ki 0.1
217 
+  //#define  DEFAULT_Kd 12
218 
+
219 
+  // Mendel Parts V9 on 12V
220 
+  //#define  DEFAULT_Kp 63.0
221 
+  //#define  DEFAULT_Ki 2.25
222 
+  //#define  DEFAULT_Kd 440
223 
+
223 
 #endif // PIDTEMP
 224 
 #endif // PIDTEMP
224
225
225 
 //===========================================================================
 226 
 //===========================================================================

+ 1
- 17
Marlin/example_configurations/Hephestos/Configuration.h View File

208 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 208 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
209 
   #define K1 0.95 //smoothing factor within the PID
 209 
   #define K1 0.95 //smoothing factor within the PID
210
210
211 
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
212 
-  // Ultimaker
213 
-  //#define  DEFAULT_Kp 22.2
214 
-  //#define  DEFAULT_Ki 1.08
215 
-  //#define  DEFAULT_Kd 114
216 
-
217 
-  // MakerGear
218 
-  //#define  DEFAULT_Kp 7.0
219 
-  //#define  DEFAULT_Ki 0.1
220 
-  //#define  DEFAULT_Kd 12
221 
-
222 
-  // Mendel Parts V9 on 12V
223 
-  //#define  DEFAULT_Kp 63.0
224 
-  //#define  DEFAULT_Ki 2.25
225 
-  //#define  DEFAULT_Kd 440
226 
-
227 
-  // Hephestos (i3)
211 
+  // Hephestos i3
228 
   #define  DEFAULT_Kp 23.05
 212 
   #define  DEFAULT_Kp 23.05
229 
   #define  DEFAULT_Ki 2.00
 213 
   #define  DEFAULT_Ki 2.00
230 
   #define  DEFAULT_Kd 66.47
 214 
   #define  DEFAULT_Kd 66.47

+ 0
- 28
Marlin/example_configurations/K8200/Configuration.h View File

210 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 210 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
211 
   #define K1 0.95 //smoothing factor within the PID
 211 
   #define K1 0.95 //smoothing factor within the PID
212
212
213 
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
214 
-  // Ultimaker
215 
-  //#define  DEFAULT_Kp 22.2
216 
-  //#define  DEFAULT_Ki 1.08
217 
-  //#define  DEFAULT_Kd 114
218 
-
219 
-  // MakerGear
220 
-  //#define  DEFAULT_Kp 7.0
221 
-  //#define  DEFAULT_Ki 0.1
222 
-  //#define  DEFAULT_Kd 12
223 
-
224 
-  // Mendel Parts V9 on 12V
225 
-  //#define  DEFAULT_Kp 63.0
226 
-  //#define  DEFAULT_Ki 2.25
227 
-  //#define  DEFAULT_Kd 440
228 
-
229 
   // Vellemann K8200 Extruder - calculated with PID Autotune and tested
 213 
   // Vellemann K8200 Extruder - calculated with PID Autotune and tested
230 
   #define  DEFAULT_Kp 24.29
 214 
   #define  DEFAULT_Kp 24.29
231 
   #define  DEFAULT_Ki 1.58
 215 
   #define  DEFAULT_Ki 1.58
261
245
262 
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
 246 
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
263
247
264 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
265 
-  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
266 
-  //#define  DEFAULT_bedKp 10.00
267 
-  //#define  DEFAULT_bedKi .023
268 
-  //#define  DEFAULT_bedKd 305.4
269 
-
270 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
271 
-  //from pidautotune
272 
-  //#define  DEFAULT_bedKp 97.1
273 
-  //#define  DEFAULT_bedKi 1.41
274 
-  //#define  DEFAULT_bedKd 1675.16
275 
-
276 
   //Vellemann K8200 PCB heatbed with standard PCU at 60 degreesC - calculated with PID Autotune and tested
 248 
   //Vellemann K8200 PCB heatbed with standard PCU at 60 degreesC - calculated with PID Autotune and tested
277 
   //from pidautotune
 249 
   //from pidautotune
278 
   #define  DEFAULT_bedKp 341.88
 250 
   #define  DEFAULT_bedKp 341.88

+ 0
- 16
Marlin/example_configurations/RigidBot/Configuration.h View File

211 
   #define  DEFAULT_Ki 4.21      //Base DGlass3D/E3Dv6 = 0.85 ; RigidBot redesigned = 0.85
 211 
   #define  DEFAULT_Ki 4.21      //Base DGlass3D/E3Dv6 = 0.85 ; RigidBot redesigned = 0.85
212 
   #define  DEFAULT_Kd 88.41     //Base DGlass3D/E3Dv6 = 245  ; RigidBot redesigned = 76.55
 212 
   #define  DEFAULT_Kd 88.41     //Base DGlass3D/E3Dv6 = 245  ; RigidBot redesigned = 76.55
213
213
214 
-  // MakerGear
215 
-  //#define  DEFAULT_Kp 7.0
216 
-  //#define  DEFAULT_Ki 0.1
217 
-  //#define  DEFAULT_Kd 12
218 
-
219 
-  // Mendel Parts V9 on 12V
220 
-  //#define  DEFAULT_Kp 63.0
221 
-  //#define  DEFAULT_Ki 2.25
222 
-  //#define  DEFAULT_Kd 440
223 
-
224 
 #endif // PIDTEMP
 214 
 #endif // PIDTEMP
225
215
226 
 //===========================================================================
 216 
 //===========================================================================
256 
   #define  DEFAULT_bedKi 66.5
 246 
   #define  DEFAULT_bedKi 66.5
257 
   #define  DEFAULT_bedKd 480
 247 
   #define  DEFAULT_bedKd 480
258
248
259 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
260 
-  //from pidautotune
261 
-  //#define  DEFAULT_bedKp 97.1
262 
-  //#define  DEFAULT_bedKi 1.41
263 
-  //#define  DEFAULT_bedKd 1675.16
264 
-
265 
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
 249 
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
266 
 #endif // PIDTEMPBED
 250 
 #endif // PIDTEMPBED
267
251

+ 0
- 33
Marlin/example_configurations/SCARA/Configuration.h View File

230 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 230 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
231 
   #define K1 0.95 //smoothing factor within the PID
 231 
   #define K1 0.95 //smoothing factor within the PID
232
232
233 
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
234 
-  // Ultimaker
235 
-  //#define  DEFAULT_Kp 22.2
236 
-  //#define  DEFAULT_Ki 1.08
237 
-  //#define  DEFAULT_Kd 114
238 
-
239 
-  // MakerGear
240 
-  //#define  DEFAULT_Kp 7.0
241 
-  //#define  DEFAULT_Ki 0.1
242 
-  //#define  DEFAULT_Kd 12
243 
-
244 
-  // Mendel Parts V9 on 12V
245 
-  //#define  DEFAULT_Kp 63.0
246 
-  //#define  DEFAULT_Ki 2.25
247 
-  //#define  DEFAULT_Kd 440
248 
-
249 
-  // Jhead MK5: From Autotune
250 
-  //#define  DEFAULT_Kp 20.92
251 
-  //#define  DEFAULT_Ki 1.51
252 
-  //#define  DEFAULT_Kd 72.34
253 
-
254 
   // Merlin Hotend: From Autotune
 233 
   // Merlin Hotend: From Autotune
255 
   #define  DEFAULT_Kp 24.5
 234 
   #define  DEFAULT_Kp 24.5
256 
   #define  DEFAULT_Ki 1.72
 235 
   #define  DEFAULT_Ki 1.72
286
265
287 
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
 266 
   #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term
288
267
289 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
290 
-  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
291 
-  //#define  DEFAULT_bedKp 10.00
292 
-  //#define  DEFAULT_bedKi .023
293 
-  //#define  DEFAULT_bedKd 305.4
294 
-
295 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
296 
-  //from pidautotune
297 
-  //#define  DEFAULT_bedKp 97.1
298 
-  //#define  DEFAULT_bedKi 1.41
299 
-  //#define  DEFAULT_bedKd 1675.16
300 
-
301 
   //12v Heatbed Mk3 12V in parallel
 268 
   //12v Heatbed Mk3 12V in parallel
302 
   //from pidautotune
 269 
   //from pidautotune
303 
   #define  DEFAULT_bedKp 630.14
 270 
   #define  DEFAULT_bedKp 630.14

+ 0
- 16
Marlin/example_configurations/WITBOX/Configuration.h View File

208 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 208 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
209 
   #define K1 0.95 //smoothing factor within the PID
 209 
   #define K1 0.95 //smoothing factor within the PID
210
210
211 
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
212 
-  // Ultimaker
213 
-  //#define  DEFAULT_Kp 22.2
214 
-  //#define  DEFAULT_Ki 1.08
215 
-  //#define  DEFAULT_Kd 114
216 
-
217 
-  // MakerGear
218 
-  //#define  DEFAULT_Kp 7.0
219 
-  //#define  DEFAULT_Ki 0.1
220 
-  //#define  DEFAULT_Kd 12
221 
-
222 
-  // Mendel Parts V9 on 12V
223 
-  //#define  DEFAULT_Kp 63.0
224 
-  //#define  DEFAULT_Ki 2.25
225 
-  //#define  DEFAULT_Kd 440
226 
-
227 
   // Witbox
 211 
   // Witbox
228 
   #define  DEFAULT_Kp 22.2
 212 
   #define  DEFAULT_Kp 22.2
229 
   #define  DEFAULT_Ki 1.08
 213 
   #define  DEFAULT_Ki 1.08

+ 16
- 15
Marlin/example_configurations/adafruit/ST7565/Configuration.h View File

205 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 205 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
206 
   #define K1 0.95 //smoothing factor within the PID
 206 
   #define K1 0.95 //smoothing factor within the PID
207
207
208 
-// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209 
-// Ultimaker
210 
-    #define  DEFAULT_Kp 22.2
211 
-    #define  DEFAULT_Ki 1.08
212 
-    #define  DEFAULT_Kd 114
213 
-
214 
-// MakerGear
215 
-//    #define  DEFAULT_Kp 7.0
216 
-//    #define  DEFAULT_Ki 0.1
217 
-//    #define  DEFAULT_Kd 12
218 
-
219 
-// Mendel Parts V9 on 12V
220 
-//    #define  DEFAULT_Kp 63.0
221 
-//    #define  DEFAULT_Ki 2.25
222 
-//    #define  DEFAULT_Kd 440
208 
+  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
209 
+  // Ultimaker
210 
+  #define  DEFAULT_Kp 22.2
211 
+  #define  DEFAULT_Ki 1.08
212 
+  #define  DEFAULT_Kd 114
213 
+
214 
+  // MakerGear
215 
+  //#define  DEFAULT_Kp 7.0
216 
+  //#define  DEFAULT_Ki 0.1
217 
+  //#define  DEFAULT_Kd 12
218 
+
219 
+  // Mendel Parts V9 on 12V
220 
+  //#define  DEFAULT_Kp 63.0
221 
+  //#define  DEFAULT_Ki 2.25
222 
+  //#define  DEFAULT_Kd 440
223 
+
223 
 #endif // PIDTEMP
 224 
 #endif // PIDTEMP
224
225
225 
 //===========================================================================
 226 
 //===========================================================================

+ 0
- 28
Marlin/example_configurations/delta/kossel_pro/Configuration.h View File

209 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
 209 
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
210 
   #define K1 0.95 //smoothing factor within the PID
 210 
   #define K1 0.95 //smoothing factor within the PID
211
211
212 
-  // If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it
213 
-  // Ultimaker
214 
-  //#define  DEFAULT_Kp 22.2
215 
-  //#define  DEFAULT_Ki 1.08
216 
-  //#define  DEFAULT_Kd 114
217 
-
218 
   // Kossel Pro
 212 
   // Kossel Pro
219 
   #define  DEFAULT_Kp 19.30
 213 
   #define  DEFAULT_Kp 19.30
220 
   #define  DEFAULT_Ki 3.51
 214 
   #define  DEFAULT_Ki 3.51
221 
   #define  DEFAULT_Kd 26.56
 215 
   #define  DEFAULT_Kd 26.56
222
216
223 
-  // MakerGear
224 
-  //#define  DEFAULT_Kp 7.0
225 
-  //#define  DEFAULT_Ki 0.1
226 
-  //#define  DEFAULT_Kd 12
227 
-
228 
-  // Mendel Parts V9 on 12V
229 
-  //#define  DEFAULT_Kp 63.0
230 
-  //#define  DEFAULT_Ki 2.25
231 
-  //#define  DEFAULT_Kd 440
232 
-
233 
 #endif // PIDTEMP
 217 
 #endif // PIDTEMP
234
218
235 
 //===========================================================================
 219 
 //===========================================================================
266 
   #define  DEFAULT_bedKi 62.77
 250 
   #define  DEFAULT_bedKi 62.77
267 
   #define  DEFAULT_bedKd 545.98
 251 
   #define  DEFAULT_bedKd 545.98
268
252
269 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
270 
-  //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
271 
-  //#define  DEFAULT_bedKp 10.00
272 
-  //#define  DEFAULT_bedKi .023
273 
-  //#define  DEFAULT_bedKd 305.4
274 
-
275 
-  //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
276 
-  //from pidautotune
277 
-  //#define  DEFAULT_bedKp 97.1
278 
-  //#define  DEFAULT_bedKi 1.41
279 
-  //#define  DEFAULT_bedKd 1675.16
280 
-
281 
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
 253 
   // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
282 
 #endif // PIDTEMPBED
 254 
 #endif // PIDTEMPBED
283
255

+ 0
- 15
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

211 
   #define  DEFAULT_Ki 2.30
 211 
   #define  DEFAULT_Ki 2.30
212 
   #define  DEFAULT_Kd 68.15
 212 
   #define  DEFAULT_Kd 68.15
213
213
214 
-  // Ultimaker
215 
-  //#define  DEFAULT_Kp 22.2
216 
-  //#define  DEFAULT_Ki 1.08
217 
-  //#define  DEFAULT_Kd 114
218 
-
219 
-  // MakerGear
220 
-  //#define  DEFAULT_Kp 7.0
221 
-  //#define  DEFAULT_Ki 0.1
222 
-  //#define  DEFAULT_Kd 12
223 
-
224 
-  // Mendel Parts V9 on 12V
225 
-  //#define  DEFAULT_Kp 63.0
226 
-  //#define  DEFAULT_Ki 2.25
227 
-  //#define  DEFAULT_Kd 440
228 
-
229 
 #endif // PIDTEMP
 214 
 #endif // PIDTEMP
230
215
231 
 //===========================================================================
 216 
 //===========================================================================

Write Preview
Loading…
Cancel
Save