chiark / gitweb /
Fixed MAX6675
authorErik van der Zalm <erik@vdzalm.eu>
Tue, 10 Apr 2012 19:57:57 +0000 (21:57 +0200)
committerErik van der Zalm <erik@vdzalm.eu>
Tue, 10 Apr 2012 19:57:57 +0000 (21:57 +0200)
Marlin/temperature.cpp

index 0529b534afd7f56ea055a9090084c7e0b88d31de..91d26720a77bd932de29bf70f62ab2883f30d877 100644 (file)
@@ -153,7 +153,9 @@ void PID_autotune(float temp)
   float max, min;
   
   SERIAL_ECHOLN("PID Autotune start");
-
+  
+  disable_heater(); // switch off all heaters.
+  
   for(;;) {
 
     if(temp_meas_ready == true) { // temp sample ready
@@ -921,14 +923,14 @@ ISR(TIMER0_COMPB_vect)
     
   if(temp_count >= 16) // 8 ms * 16 = 128ms.
   {
-    #ifdef HEATER_0_USES_AD595
+    #ifdef HEATER_0_USES_AD595 || defined HEATER_0_USES_MAX6675
       current_raw[0] = raw_temp_0_value;
     #else
       current_raw[0] = 16383 - raw_temp_0_value;
     #endif
 
 #if EXTRUDERS > 1    
-    #ifdef HEATER_1_USES_AD595 || defined HEATER_0_USES_MAX6675
+    #ifdef HEATER_1_USES_AD595
       current_raw[1] = raw_temp_1_value;
     #else
       current_raw[1] = 16383 - raw_temp_1_value;