Browse Source

Independent PID parameters for each extruder

* Variables Kp, Ki, Kd, Kc now arrays of size EXTRUDERS
* M301 gains (optional, default=0) E parameter to define which
extruder's settings to modify. Tested, works with Repetier Host's EEPROM
config window, albeit only reads/updates settings for E0.
* All Kp, Ki, Kd, Kc parameters saved in EEPROM (version now v14), up to
3 extruders supported (same as Marlin in general)
grob6000 10 years ago
parent
commit
37c7e8300f
4 changed files with 184 additions and 101 deletions
  1. 127
    65
      Marlin/ConfigurationStore.cpp
  2. 42
    22
      Marlin/Marlin_main.cpp
  3. 14
    13
      Marlin/temperature.cpp
  4. 1
    1
      Marlin/temperature.h

+ 127
- 65
Marlin/ConfigurationStore.cpp View File

@@ -38,7 +38,7 @@ void _EEPROM_readData(int &pos, uint8_t* value, uint8_t size)
38 38
 // wrong data being written to the variables.
39 39
 // ALSO:  always make sure the variables in the Store and retrieve sections are in the same order.
40 40
 
41
-#define EEPROM_VERSION "V13"
41
+#define EEPROM_VERSION "V14"
42 42
 
43 43
 #ifdef EEPROM_SETTINGS
44 44
 void Config_StoreSettings() 
@@ -63,11 +63,11 @@ void Config_StoreSettings()
63 63
   EEPROM_WRITE_VAR(i,delta_radius);
64 64
   EEPROM_WRITE_VAR(i,delta_diagonal_rod);
65 65
   EEPROM_WRITE_VAR(i,delta_segments_per_second);
66
-  #endif
66
+  #endif//DELTA
67 67
   #ifndef ULTIPANEL
68 68
   int plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP, plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP, plaPreheatFanSpeed = PLA_PREHEAT_FAN_SPEED;
69 69
   int absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP, absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP, absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
70
-  #endif
70
+  #endif//ULTIPANEL
71 71
   EEPROM_WRITE_VAR(i,plaPreheatHotendTemp);
72 72
   EEPROM_WRITE_VAR(i,plaPreheatHPBTemp);
73 73
   EEPROM_WRITE_VAR(i,plaPreheatFanSpeed);
@@ -76,37 +76,58 @@ void Config_StoreSettings()
76 76
   EEPROM_WRITE_VAR(i,absPreheatFanSpeed);
77 77
   EEPROM_WRITE_VAR(i,zprobe_zoffset);
78 78
   #ifdef PIDTEMP
79
-    EEPROM_WRITE_VAR(i,Kp);
80
-    EEPROM_WRITE_VAR(i,Ki);
81
-    EEPROM_WRITE_VAR(i,Kd);
82
-  #else
79
+    float dummy = 0.0f;
80
+    for (int e = 0; e < 3; e++)
81
+	{
82
+	  if (e < EXTRUDERS)
83
+	  {
84
+        EEPROM_WRITE_VAR(i,Kp[e]);
85
+        EEPROM_WRITE_VAR(i,Ki[e]);
86
+        EEPROM_WRITE_VAR(i,Kd[e]);
87
+        #ifdef PID_ADD_EXTRUSION_RATE
88
+        EEPROM_WRITE_VAR(i,Kc[e]);
89
+        #else//PID_ADD_EXTRUSION_RATE
90
+		dummy = 1.0f; // 1.0 = default kc
91
+	    EEPROM_WRITE_VAR(dummmy);
92
+        #endif//PID_ADD_EXTRUSION_RATE
93
+	  }
94
+	  else
95
+	  {
96
+		dummy = 3000.0f;
97
+	    EEPROM_WRITE_VAR(i, dummy);
98
+		dummy = 0.0f;
99
+        EEPROM_WRITE_VAR(i,dummy);
100
+        EEPROM_WRITE_VAR(i,dummy);
101
+	  }
102
+	}
103
+  #else//PIDTEMP
83 104
 		float dummy = 3000.0f;
84 105
     EEPROM_WRITE_VAR(i,dummy);
85 106
 		dummy = 0.0f;
86 107
     EEPROM_WRITE_VAR(i,dummy);
87 108
     EEPROM_WRITE_VAR(i,dummy);
88
-  #endif
109
+  #endif//PIDTEMP
89 110
   #ifndef DOGLCD
90 111
     int lcd_contrast = 32;
91
-  #endif
112
+  #endif//DOGLCD
92 113
   EEPROM_WRITE_VAR(i,lcd_contrast);
93 114
   #ifdef SCARA
94 115
   EEPROM_WRITE_VAR(i,axis_scaling);        // Add scaling for SCARA
95
-  #endif
116
+  #endif//SCARA
96 117
   #ifdef FWRETRACT
97 118
   EEPROM_WRITE_VAR(i,autoretract_enabled);
98 119
   EEPROM_WRITE_VAR(i,retract_length);
99 120
   #if EXTRUDERS > 1
100 121
   EEPROM_WRITE_VAR(i,retract_length_swap);
101
-  #endif
122
+  #endif//EXTRUDERS > 1
102 123
   EEPROM_WRITE_VAR(i,retract_feedrate);
103 124
   EEPROM_WRITE_VAR(i,retract_zlift);
104 125
   EEPROM_WRITE_VAR(i,retract_recover_length);
105 126
   #if EXTRUDERS > 1
106 127
   EEPROM_WRITE_VAR(i,retract_recover_length_swap);
107
-  #endif
128
+  #endif//EXTRUDERS > 1
108 129
   EEPROM_WRITE_VAR(i,retract_recover_feedrate);
109
-  #endif
130
+  #endif//FWRETRACT
110 131
 
111 132
   // Save filament sizes
112 133
   EEPROM_WRITE_VAR(i, volumetric_enabled);
@@ -115,8 +136,8 @@ void Config_StoreSettings()
115 136
   EEPROM_WRITE_VAR(i, filament_size[1]);
116 137
   #if EXTRUDERS > 2
117 138
   EEPROM_WRITE_VAR(i, filament_size[2]);
118
-  #endif
119
-  #endif
139
+  #endif//EXTRUDERS > 2
140
+  #endif//EXTRUDERS > 1
120 141
   
121 142
   char ver2[4]=EEPROM_VERSION;
122 143
   i=EEPROM_OFFSET;
@@ -149,7 +170,7 @@ SERIAL_ECHOLNPGM("Scaling factors:");
149 170
     SERIAL_ECHOLN("");
150 171
       
151 172
     SERIAL_ECHO_START;
152
-#endif
173
+#endif//SCARA
153 174
     SERIAL_ECHOLNPGM("Maximum feedrates (mm/s):");
154 175
     SERIAL_ECHO_START;
155 176
     SERIAL_ECHOPAIR("  M203 X", max_feedrate[X_AXIS]);
@@ -206,16 +227,23 @@ SERIAL_ECHOLNPGM("Scaling factors:");
206 227
 	SERIAL_ECHOPAIR(" R" ,delta_radius );
207 228
 	SERIAL_ECHOPAIR(" S" ,delta_segments_per_second );
208 229
 	SERIAL_ECHOLN("");
209
-#endif
230
+#endif//DELTA
210 231
 #ifdef PIDTEMP
211 232
     SERIAL_ECHO_START;
212 233
     SERIAL_ECHOLNPGM("PID settings:");
213
-    SERIAL_ECHO_START;
214
-    SERIAL_ECHOPAIR("   M301 P",Kp); 
215
-    SERIAL_ECHOPAIR(" I" ,unscalePID_i(Ki)); 
216
-    SERIAL_ECHOPAIR(" D" ,unscalePID_d(Kd));
217
-    SERIAL_ECHOLN(""); 
218
-#endif
234
+	for (int e = 0; e < EXTRUDERS; e++)
235
+	{
236
+	  SERIAL_ECHO_START;
237
+      SERIAL_ECHOPAIR("   M301 E", (long unsigned int)e);
238
+	  SERIAL_ECHOPAIR(" P", Kp[e]);
239
+      SERIAL_ECHOPAIR(" I" ,unscalePID_i(Ki[e])); 
240
+      SERIAL_ECHOPAIR(" D" ,unscalePID_d(Kd[e]));
241
+#ifdef PID_ADD_EXTRUSION_RATE
242
+      SERIAL_ECHOPAIR(" C" ,Kc[e]);
243
+#endif//PID_ADD_EXTRUSION_RATE	  
244
+      SERIAL_ECHOLN(""); 
245
+	}
246
+#endif//PIDTEMP
219 247
 #ifdef FWRETRACT
220 248
     SERIAL_ECHO_START;
221 249
     SERIAL_ECHOLNPGM("Retract: S=Length (mm) F:Speed (mm/m) Z: ZLift (mm)");
@@ -244,7 +272,7 @@ SERIAL_ECHOLNPGM("Scaling factors:");
244 272
     SERIAL_ECHO_START;
245 273
     SERIAL_ECHOPAIR("   Swap rec. addl. length (mm): ", retract_recover_length_swap);
246 274
     SERIAL_ECHOLN("");
247
-#endif
275
+#endif//EXTRUDERS > 1
248 276
     SERIAL_ECHO_START;
249 277
     if (volumetric_enabled) {
250 278
         SERIAL_ECHOLNPGM("Filament settings:");
@@ -259,14 +287,14 @@ SERIAL_ECHOLNPGM("Scaling factors:");
259 287
 		SERIAL_ECHO_START;
260 288
         SERIAL_ECHOPAIR("   M200 T2 D", filament_size[2]);
261 289
 		SERIAL_ECHOLN("");
262
-#endif
263
-#endif
290
+#endif//EXTRUDERS > 2
291
+#endif//EXTRUDERS > 1
264 292
     } else {
265 293
         SERIAL_ECHOLNPGM("Filament settings: Disabled");
266 294
     }
267
-#endif
295
+#endif//FWRETRACT
268 296
 }
269
-#endif
297
+#endif//DISABLE_M503
270 298
 
271 299
 
272 300
 #ifdef EEPROM_SETTINGS
@@ -301,11 +329,11 @@ void Config_RetrieveSettings()
301 329
 		EEPROM_READ_VAR(i,delta_radius);
302 330
 		EEPROM_READ_VAR(i,delta_diagonal_rod);
303 331
 		EEPROM_READ_VAR(i,delta_segments_per_second);
304
-        #endif
332
+        #endif//DELTA
305 333
         #ifndef ULTIPANEL
306 334
         int plaPreheatHotendTemp, plaPreheatHPBTemp, plaPreheatFanSpeed;
307 335
         int absPreheatHotendTemp, absPreheatHPBTemp, absPreheatFanSpeed;
308
-        #endif
336
+        #endif//ULTIPANEL
309 337
         EEPROM_READ_VAR(i,plaPreheatHotendTemp);
310 338
         EEPROM_READ_VAR(i,plaPreheatHPBTemp);
311 339
         EEPROM_READ_VAR(i,plaPreheatFanSpeed);
@@ -313,35 +341,68 @@ void Config_RetrieveSettings()
313 341
         EEPROM_READ_VAR(i,absPreheatHPBTemp);
314 342
         EEPROM_READ_VAR(i,absPreheatFanSpeed);
315 343
         EEPROM_READ_VAR(i,zprobe_zoffset);
316
-        #ifndef PIDTEMP
317
-        float Kp,Ki,Kd;
318
-        #endif
319
-        // do not need to scale PID values as the values in EEPROM are already scaled		
320
-        EEPROM_READ_VAR(i,Kp);
321
-        EEPROM_READ_VAR(i,Ki);
322
-        EEPROM_READ_VAR(i,Kd);
344
+        #ifdef PIDTEMP
345
+		float dummy = 0.0f;
346
+		for (int e = 0; e < 3; e++) // 3 = max extruders supported by marlin
347
+		{
348
+		  if (e < EXTRUDERS)
349
+		  {
350
+		    // do not need to scale PID values as the values in EEPROM are already scaled			  
351
+            EEPROM_READ_VAR(i,Kp[e]);
352
+            EEPROM_READ_VAR(i,Ki[e]);
353
+		    EEPROM_READ_VAR(i,Kd[e]);
354
+#ifdef PID_ADD_EXTRUSION_RATE
355
+            EEPROM_READ_VAR(i,Kc[e]);
356
+#else//PID_ADD_EXTRUSION_RATE
357
+	        EEPROM_READ_VAR(i,dummy);
358
+#endif//PID_ADD_EXTRUSION_RATE
359
+		  }
360
+		  else
361
+		  {
362
+			EEPROM_READ_VAR(i,dummy);
363
+			EEPROM_READ_VAR(i,dummy);
364
+			EEPROM_READ_VAR(i,dummy);
365
+			EEPROM_READ_VAR(i,dummy);
366
+		  }
367
+		}
368
+		#else//PIDTEMP
369
+		// 4 x 3 = 12 slots for PID parameters
370
+		float dummy = 0.0f;
371
+		EEPROM_READ_VAR(i,dummy);
372
+		EEPROM_READ_VAR(i,dummy);
373
+		EEPROM_READ_VAR(i,dummy);
374
+		EEPROM_READ_VAR(i,dummy);
375
+		EEPROM_READ_VAR(i,dummy);
376
+		EEPROM_READ_VAR(i,dummy);
377
+		EEPROM_READ_VAR(i,dummy);
378
+		EEPROM_READ_VAR(i,dummy);
379
+		EEPROM_READ_VAR(i,dummy);
380
+		EEPROM_READ_VAR(i,dummy);
381
+		EEPROM_READ_VAR(i,dummy);
382
+		EEPROM_READ_VAR(i,dummy);			
383
+		#endif//PIDTEMP
323 384
         #ifndef DOGLCD
324 385
         int lcd_contrast;
325
-        #endif
386
+        #endif//DOGLCD
326 387
         EEPROM_READ_VAR(i,lcd_contrast);
327 388
 		#ifdef SCARA
328 389
 		EEPROM_READ_VAR(i,axis_scaling);
329
-		#endif
390
+		#endif//SCARA
330 391
 
331 392
 		#ifdef FWRETRACT
332 393
 		EEPROM_READ_VAR(i,autoretract_enabled);
333 394
 		EEPROM_READ_VAR(i,retract_length);
334 395
 		#if EXTRUDERS > 1
335 396
 		EEPROM_READ_VAR(i,retract_length_swap);
336
-		#endif
397
+		#endif//EXTRUDERS > 1
337 398
 		EEPROM_READ_VAR(i,retract_feedrate);
338 399
 		EEPROM_READ_VAR(i,retract_zlift);
339 400
 		EEPROM_READ_VAR(i,retract_recover_length);
340 401
 		#if EXTRUDERS > 1
341 402
 		EEPROM_READ_VAR(i,retract_recover_length_swap);
342
-		#endif
403
+		#endif//EXTRUDERS > 1
343 404
 		EEPROM_READ_VAR(i,retract_recover_feedrate);
344
-		#endif
405
+		#endif//FWRETRACT
345 406
 
346 407
 		EEPROM_READ_VAR(i, volumetric_enabled);
347 408
 		EEPROM_READ_VAR(i, filament_size[0]);
@@ -349,8 +410,8 @@ void Config_RetrieveSettings()
349 410
 		EEPROM_READ_VAR(i, filament_size[1]);
350 411
 #if EXTRUDERS > 2
351 412
 		EEPROM_READ_VAR(i, filament_size[2]);
352
-#endif
353
-#endif
413
+#endif//EXTRUDERS > 2
414
+#endif//EXTRUDERS > 1
354 415
 		calculate_volumetric_multipliers();
355 416
 		// Call updatePID (similar to when we have processed M301)
356 417
 		updatePID();
@@ -363,9 +424,9 @@ void Config_RetrieveSettings()
363 424
     }
364 425
     #ifdef EEPROM_CHITCHAT
365 426
       Config_PrintSettings();
366
-    #endif
427
+    #endif//EEPROM_CHITCHAT
367 428
 }
368
-#endif
429
+#endif//EEPROM_SETTINGS
369 430
 
370 431
 void Config_ResetDefault()
371 432
 {
@@ -379,7 +440,7 @@ void Config_ResetDefault()
379 440
         max_acceleration_units_per_sq_second[i]=tmp3[i];
380 441
 		#ifdef SCARA
381 442
 		axis_scaling[i]=1;
382
-		#endif
443
+		#endif//SCARA
383 444
     }
384 445
     
385 446
     // steps per sq second need to be updated to agree with the units per sq second
@@ -400,7 +461,7 @@ void Config_ResetDefault()
400 461
 	delta_diagonal_rod= DELTA_DIAGONAL_ROD;
401 462
 	delta_segments_per_second= DELTA_SEGMENTS_PER_SECOND;
402 463
 	recalc_delta_settings(delta_radius, delta_diagonal_rod);
403
-#endif
464
+#endif//DELTA
404 465
 #ifdef ULTIPANEL
405 466
     plaPreheatHotendTemp = PLA_PREHEAT_HOTEND_TEMP;
406 467
     plaPreheatHPBTemp = PLA_PREHEAT_HPB_TEMP;
@@ -408,24 +469,25 @@ void Config_ResetDefault()
408 469
     absPreheatHotendTemp = ABS_PREHEAT_HOTEND_TEMP;
409 470
     absPreheatHPBTemp = ABS_PREHEAT_HPB_TEMP;
410 471
     absPreheatFanSpeed = ABS_PREHEAT_FAN_SPEED;
411
-#endif
472
+#endif//ULTIPANEL
412 473
 #ifdef ENABLE_AUTO_BED_LEVELING
413 474
     zprobe_zoffset = -Z_PROBE_OFFSET_FROM_EXTRUDER;
414
-#endif
475
+#endif//ENABLE_AUTO_BED_LEVELING
415 476
 #ifdef DOGLCD
416 477
     lcd_contrast = DEFAULT_LCD_CONTRAST;
417
-#endif
478
+#endif//DOGLCD
418 479
 #ifdef PIDTEMP
419
-    Kp = DEFAULT_Kp;
420
-    Ki = scalePID_i(DEFAULT_Ki);
421
-    Kd = scalePID_d(DEFAULT_Kd);
422
-    
423
-    // call updatePID (similar to when we have processed M301)
424
-    updatePID();
425
-    
480
+	for (int e = 0; e < EXTRUDERS; e++)
481
+	{
482
+      Kp[e] = DEFAULT_Kp;
483
+      Ki[e] = scalePID_i(DEFAULT_Ki);
484
+      Kd[e] = scalePID_d(DEFAULT_Kd);
426 485
 #ifdef PID_ADD_EXTRUSION_RATE
427
-    Kc = DEFAULT_Kc;
486
+      Kc[e] = DEFAULT_Kc;
428 487
 #endif//PID_ADD_EXTRUSION_RATE
488
+    }
489
+    // call updatePID (similar to when we have processed M301)
490
+    updatePID();
429 491
 #endif//PIDTEMP
430 492
 
431 493
 #ifdef FWRETRACT
@@ -433,15 +495,15 @@ void Config_ResetDefault()
433 495
 	retract_length = RETRACT_LENGTH;
434 496
 #if EXTRUDERS > 1
435 497
 	retract_length_swap = RETRACT_LENGTH_SWAP;
436
-#endif
498
+#endif//EXTRUDERS > 1
437 499
 	retract_feedrate = RETRACT_FEEDRATE;
438 500
 	retract_zlift = RETRACT_ZLIFT;
439 501
 	retract_recover_length = RETRACT_RECOVER_LENGTH;
440 502
 #if EXTRUDERS > 1
441 503
 	retract_recover_length_swap = RETRACT_RECOVER_LENGTH_SWAP;
442
-#endif
504
+#endif//EXTRUDERS > 1
443 505
 	retract_recover_feedrate = RETRACT_RECOVER_FEEDRATE;
444
-#endif
506
+#endif//FWRETRACT
445 507
 
446 508
 	volumetric_enabled = false;
447 509
 	filament_size[0] = DEFAULT_NOMINAL_FILAMENT_DIA;
@@ -449,11 +511,11 @@ void Config_ResetDefault()
449 511
 	filament_size[1] = DEFAULT_NOMINAL_FILAMENT_DIA;
450 512
 #if EXTRUDERS > 2
451 513
 	filament_size[2] = DEFAULT_NOMINAL_FILAMENT_DIA;
452
-#endif
453
-#endif
514
+#endif//EXTRUDERS > 2
515
+#endif//EXTRUDERS > 1
454 516
 	calculate_volumetric_multipliers();
455 517
 
456 518
 SERIAL_ECHO_START;
457 519
 SERIAL_ECHOLNPGM("Hardcoded Default Settings Loaded");
458 520
 
459
-}
521
+}

+ 42
- 22
Marlin/Marlin_main.cpp View File

@@ -3196,30 +3196,50 @@ Sigma_Exit:
3196 3196
     #endif // M300
3197 3197
 
3198 3198
     #ifdef PIDTEMP
3199
-    case 301: // M301
3200
-      {
3201
-        if(code_seen('P')) Kp = code_value();
3202
-        if(code_seen('I')) Ki = scalePID_i(code_value());
3203
-        if(code_seen('D')) Kd = scalePID_d(code_value());
3199
+	case 301: // M301
3200
+	{
3204 3201
 
3205
-        #ifdef PID_ADD_EXTRUSION_RATE
3206
-        if(code_seen('C')) Kc = code_value();
3207
-        #endif
3202
+		// multi-extruder PID patch: M301 updates or prints a single extruder's PID values
3203
+		// default behaviour (omitting E parameter) is to update for extruder 0 only
3204
+		int e = 0; // extruder being updated
3205
+		if (code_seen('E'))
3206
+		{
3207
+			e = (int)code_value();
3208
+		}
3209
+		if (e < EXTRUDERS) // catch bad input value
3210
+		{
3211
+
3212
+			if (code_seen('P')) Kp[e] = code_value();
3213
+			if (code_seen('I')) Ki[e] = scalePID_i(code_value());
3214
+			if (code_seen('D')) Kd[e] = scalePID_d(code_value());
3215
+			#ifdef PID_ADD_EXTRUSION_RATE
3216
+			if (code_seen('C')) Kc[e] = code_value();
3217
+			#endif			
3218
+
3219
+			updatePID();
3220
+			SERIAL_PROTOCOL(MSG_OK);
3221
+			SERIAL_PROTOCOL(" e:"); // specify extruder in serial output
3222
+			SERIAL_PROTOCOL(e);
3223
+			SERIAL_PROTOCOL(" p:");
3224
+			SERIAL_PROTOCOL(Kp[e]);
3225
+			SERIAL_PROTOCOL(" i:");
3226
+			SERIAL_PROTOCOL(unscalePID_i(Ki[e]));
3227
+			SERIAL_PROTOCOL(" d:");
3228
+			SERIAL_PROTOCOL(unscalePID_d(Kd[e]));
3229
+			#ifdef PID_ADD_EXTRUSION_RATE
3230
+			SERIAL_PROTOCOL(" c:");
3231
+			//Kc does not have scaling applied above, or in resetting defaults
3232
+			SERIAL_PROTOCOL(Kc[e]);
3233
+			#endif
3234
+			SERIAL_PROTOCOLLN("");
3235
+		
3236
+		}
3237
+		else
3238
+		{
3239
+			SERIAL_ECHO_START;
3240
+			SERIAL_ECHOLN(MSG_INVALID_EXTRUDER);
3241
+		}
3208 3242
 
3209
-        updatePID();
3210
-        SERIAL_PROTOCOL(MSG_OK);
3211
-        SERIAL_PROTOCOL(" p:");
3212
-        SERIAL_PROTOCOL(Kp);
3213
-        SERIAL_PROTOCOL(" i:");
3214
-        SERIAL_PROTOCOL(unscalePID_i(Ki));
3215
-        SERIAL_PROTOCOL(" d:");
3216
-        SERIAL_PROTOCOL(unscalePID_d(Kd));
3217
-        #ifdef PID_ADD_EXTRUSION_RATE
3218
-        SERIAL_PROTOCOL(" c:");
3219
-        //Kc does not have scaling applied above, or in resetting defaults
3220
-        SERIAL_PROTOCOL(Kc);
3221
-        #endif
3222
-        SERIAL_PROTOCOLLN("");
3223 3243
       }
3224 3244
       break;
3225 3245
     #endif //PIDTEMP

+ 14
- 13
Marlin/temperature.cpp View File

@@ -50,14 +50,6 @@ float current_temperature_bed = 0.0;
50 50
   int redundant_temperature_raw = 0;
51 51
   float redundant_temperature = 0.0;
52 52
 #endif
53
-#ifdef PIDTEMP
54
-  float Kp=DEFAULT_Kp;
55
-  float Ki=(DEFAULT_Ki*PID_dT);
56
-  float Kd=(DEFAULT_Kd/PID_dT);
57
-  #ifdef PID_ADD_EXTRUSION_RATE
58
-    float Kc=DEFAULT_Kc;
59
-  #endif
60
-#endif //PIDTEMP
61 53
 
62 54
 #ifdef PIDTEMPBED
63 55
   float bedKp=DEFAULT_bedKp;
@@ -133,6 +125,15 @@ static volatile bool temp_meas_ready = false;
133 125
   # define ARRAY_BY_EXTRUDERS(v1, v2, v3) { v1 }
134 126
 #endif
135 127
 
128
+#ifdef PIDTEMP
129
+  float Kp[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kp, DEFAULT_Kp, DEFAULT_Kp);
130
+  float Ki[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT, DEFAULT_Ki*PID_dT);
131
+  float Kd[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT, DEFAULT_Kd / PID_dT);
132
+#ifdef PID_ADD_EXTRUSION_RATE
133
+  float Kc[EXTRUDERS] = ARRAY_BY_EXTRUDERS(DEFAULT_Kc, DEFAULT_Kc, DEFAULT_Kc);
134
+#endif
135
+#endif //PIDTEMP
136
+
136 137
 // Init min and max temp with extreme values to prevent false errors during startup
137 138
 static int minttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_LO_TEMP , HEATER_1_RAW_LO_TEMP , HEATER_2_RAW_LO_TEMP );
138 139
 static int maxttemp_raw[EXTRUDERS] = ARRAY_BY_EXTRUDERS( HEATER_0_RAW_HI_TEMP , HEATER_1_RAW_HI_TEMP , HEATER_2_RAW_HI_TEMP );
@@ -342,7 +343,7 @@ void updatePID()
342 343
 {
343 344
 #ifdef PIDTEMP
344 345
   for(int e = 0; e < EXTRUDERS; e++) { 
345
-     temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;  
346
+     temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki[e];  
346 347
   }
347 348
 #endif
348 349
 #ifdef PIDTEMPBED
@@ -463,14 +464,14 @@ void manage_heater()
463 464
             temp_iState[e] = 0.0;
464 465
             pid_reset[e] = false;
465 466
           }
466
-          pTerm[e] = Kp * pid_error[e];
467
+          pTerm[e] = Kp[e] * pid_error[e];
467 468
           temp_iState[e] += pid_error[e];
468 469
           temp_iState[e] = constrain(temp_iState[e], temp_iState_min[e], temp_iState_max[e]);
469
-          iTerm[e] = Ki * temp_iState[e];
470
+          iTerm[e] = Ki[e] * temp_iState[e];
470 471
 
471 472
           //K1 defined in Configuration.h in the PID settings
472 473
           #define K2 (1.0-K1)
473
-          dTerm[e] = (Kd * (pid_input - temp_dState[e]))*K2 + (K1 * dTerm[e]);
474
+          dTerm[e] = (Kd[e] * (pid_input - temp_dState[e]))*K2 + (K1 * dTerm[e]);
474 475
           pid_output = pTerm[e] + iTerm[e] - dTerm[e];
475 476
           if (pid_output > PID_MAX) {
476 477
             if (pid_error[e] > 0 )  temp_iState[e] -= pid_error[e]; // conditional un-integration
@@ -810,7 +811,7 @@ void tp_init()
810 811
     maxttemp[e] = maxttemp[0];
811 812
 #ifdef PIDTEMP
812 813
     temp_iState_min[e] = 0.0;
813
-    temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;
814
+    temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki[e];
814 815
 #endif //PIDTEMP
815 816
 #ifdef PIDTEMPBED
816 817
     temp_iState_min_bed = 0.0;

+ 1
- 1
Marlin/temperature.h View File

@@ -58,7 +58,7 @@ extern float current_temperature_bed;
58 58
 #endif
59 59
 
60 60
 #ifdef PIDTEMP
61
-  extern float Kp,Ki,Kd,Kc;
61
+  extern float Kp[EXTRUDERS], Ki[EXTRUDERS], Kd[EXTRUDERS], Kc[EXTRUDERS];
62 62
   float scalePID_i(float i);
63 63
   float scalePID_d(float d);
64 64
   float unscalePID_i(float i);

Loading…
Cancel
Save