Merge branch 'Development' of https://github.com/MarlinFirmware/Marlin into _temp_error

2015-05-20 23:34:39 +02:00
parent 120d4c7a8c 4113762062
commit 4422365a53
38 changed files with 263 additions and 84 deletions
--- a/Marlin/temperature.cpp
+++ b/Marlin/temperature.cpp
@ -312,7 +312,8 @@ void PID_autotune(float temp, int extruder, int ncycles)
        }
      } 
    }
-    if (input > temp + 20) {
+    #define MAX_OVERSHOOT_PID_AUTOTUNE 20
+    if (input > temp + MAX_OVERSHOOT_PID_AUTOTUNE) {
      SERIAL_PROTOCOLLNPGM(MSG_PID_TEMP_TOO_HIGH);
      return;
    }