Browse Source

Tweak var names

Scott Lahteine 6 years ago
parent
commit
bf3cd8e5aa
1 changed files with 7 additions and 7 deletions
  1. 7
    7
      Marlin/src/module/temperature.cpp

+ 7
- 7
Marlin/src/module/temperature.cpp View File

@@ -351,7 +351,7 @@ temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0
351 351
 
352 352
     long bias, d;
353 353
     PID_t tune_pid = { 0, 0, 0 };
354
-    float max = 0, min = 10000;
354
+    float maxT = 0, minT = 10000;
355 355
 
356 356
     const bool isbed = (heater == H_BED);
357 357
 
@@ -424,8 +424,8 @@ temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0
424 424
 
425 425
         // Get the current temperature and constrain it
426 426
         current = GHV(temp_bed.current, temp_hotend[heater].current);
427
-        NOLESS(max, current);
428
-        NOMORE(min, current);
427
+        NOLESS(maxT, current);
428
+        NOMORE(minT, current);
429 429
 
430 430
         #if ENABLED(PRINTER_EVENT_LEDS)
431 431
           ONHEATING(start_temp, current, target);
@@ -444,7 +444,7 @@ temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0
444 444
             SHV((bias - d) >> 1, (bias - d) >> 1);
445 445
             t1 = ms;
446 446
             t_high = t1 - t2;
447
-            max = target;
447
+            maxT = target;
448 448
           }
449 449
         }
450 450
 
@@ -459,9 +459,9 @@ temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0
459 459
               LIMIT(bias, 20, max_pow - 20);
460 460
               d = (bias > max_pow >> 1) ? max_pow - 1 - bias : bias;
461 461
 
462
-              SERIAL_ECHOPAIR(MSG_BIAS, bias, MSG_D, d, MSG_T_MIN, min, MSG_T_MAX, max);
462
+              SERIAL_ECHOPAIR(MSG_BIAS, bias, MSG_D, d, MSG_T_MIN, minT, MSG_T_MAX, maxT);
463 463
               if (cycles > 2) {
464
-                const float Ku = (4.0f * d) / (float(M_PI) * (max - min) * 0.5f),
464
+                const float Ku = (4.0f * d) / (float(M_PI) * (maxT - minT) * 0.5f),
465 465
                             Tu = float(t_low + t_high) * 0.001f,
466 466
                             pf = isbed ? 0.2f : 0.6f,
467 467
                             df = isbed ? 1.0f / 3.0f : 1.0f / 8.0f;
@@ -497,7 +497,7 @@ temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0
497 497
             }
498 498
             SHV((bias + d) >> 1, (bias + d) >> 1);
499 499
             cycles++;
500
-            min = target;
500
+            minT = target;
501 501
           }
502 502
         }
503 503
       }

Loading…
Cancel
Save