Mark Finn 11 years ago
parent
commit
eb06a886c4
1 changed files with 10 additions and 8 deletions
  1. 10
    8
      Marlin/temperature.cpp

+ 10
- 8
Marlin/temperature.cpp View File

@@ -173,8 +173,8 @@ void PID_autotune(float temp, int extruder, int ncycles)
173 173
 
174 174
 	if (extruder<0)
175 175
 	{
176
-	 	soft_pwm_bed = (PID_MAX_BED)/2;
177
-		bias = d = (PID_MAX_BED)/2;
176
+	 	soft_pwm_bed = (MAX_BED_POWER)/2;
177
+		bias = d = (MAX_BED_POWER)/2;
178 178
   }
179 179
 	else
180 180
 	{
@@ -214,8 +214,8 @@ void PID_autotune(float temp, int extruder, int ncycles)
214 214
           t_low=t2 - t1;
215 215
           if(cycles > 0) {
216 216
             bias += (d*(t_high - t_low))/(t_low + t_high);
217
-            bias = constrain(bias, 20 ,(extruder<0?(PID_MAX_BED):(PID_MAX))-20);
218
-            if(bias > (extruder<0?(PID_MAX_BED):(PID_MAX))/2) d = (extruder<0?(PID_MAX_BED):(PID_MAX)) - 1 - bias;
217
+            bias = constrain(bias, 20 ,(extruder<0?(MAX_BED_POWER):(PID_MAX))-20);
218
+            if(bias > (extruder<0?(MAX_BED_POWER):(PID_MAX))/2) d = (extruder<0?(MAX_BED_POWER):(PID_MAX)) - 1 - bias;
219 219
             else d = bias;
220 220
 
221 221
             SERIAL_PROTOCOLPGM(" bias: "); SERIAL_PROTOCOL(bias);
@@ -299,6 +299,8 @@ void updatePID()
299 299
   for(int e = 0; e < EXTRUDERS; e++) { 
300 300
      temp_iState_max[e] = PID_INTEGRAL_DRIVE_MAX / Ki;  
301 301
   }
302
+#endif
303
+#ifdef PIDTEMPBED
302 304
   temp_iState_max_bed = PID_INTEGRAL_DRIVE_MAX / bedKi;  
303 305
 #endif
304 306
 }
@@ -419,10 +421,10 @@ void manage_heater()
419 421
 		  dTerm_bed= (bedKd * (pid_input - temp_dState_bed))*K2 + (K1 * dTerm_bed);
420 422
 		  temp_dState_bed = pid_input;
421 423
 
422
-		  pid_output = constrain(pTerm_bed + iTerm_bed - dTerm_bed, 0, PID_MAX_BED);
424
+		  pid_output = constrain(pTerm_bed + iTerm_bed - dTerm_bed, 0, MAX_BED_POWER);
423 425
 
424 426
     #else 
425
-      pid_output = constrain(pid_setpoint_bed, 0, PID_MAX_BED);
427
+      pid_output = constrain(pid_setpoint_bed, 0, MAX_BED_POWER);
426 428
     #endif //PID_OPENLOOP
427 429
 
428 430
 	  if((current_raw_bed > bed_minttemp) && (current_raw_bed < bed_maxttemp)) 
@@ -442,7 +444,7 @@ void manage_heater()
442 444
         }
443 445
         else 
444 446
         {
445
-					soft_pwm_bed = PID_MAX_BED>>1;
447
+					soft_pwm_bed = MAX_BED_POWER>>1;
446 448
         }
447 449
       }
448 450
       else {
@@ -459,7 +461,7 @@ void manage_heater()
459 461
         else 
460 462
           if(current_raw_bed <= target_bed_low_temp)
461 463
         {
462
-					soft_pwm_bed = PID_MAX_BED>>1;
464
+					soft_pwm_bed = MAX_BED_POWER>>1;
463 465
         }
464 466
       }
465 467
       else {

Loading…
Cancel
Save