Merge remote-tracking branch 'origin/Marlin_v1' into Marlin_v1

This commit is contained in:
Erik van der Zalm
2011-11-14 18:26:57 +01:00
4 changed files with 34 additions and 22 deletions

View File

@@ -114,6 +114,13 @@ static unsigned long previous_millis_heater, previous_millis_bed_heater;
//=============================functions ============================
//===========================================================================
void updatePID()
{
#ifdef PIDTEMP
temp_iState_max = PID_INTEGRAL_DRIVE_MAX / Ki;
#endif
}
void manage_heater()
{
#ifdef USE_WATCHDOG