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

Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin.pde

diff --cc Marlin/Configuration.h
index 7cbb66cf741314c49d4e5ec87f22220966429bfc,1e12d4e225fd048e03904343d4f54decd0ef4016..cf38cea36871c1f014eb0b0059053bb1e8d012b5
--- 1/Marlin/Configuration.h
--- 2/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@@ -243,10 -243,14 +242,12 @@@ const bool ENDSTOPS_INVERTING = true; /
  // The watchdog waits for the watchperiod in milliseconds whenever an M104 or M109 increases the target temperature
  // this enables the watchdog interrupt.
  //#define USE_WATCHDOG
- // you cannot reboot on a mega2560 due to a bug in he bootloader. Hence, you have to reset manually, and this is done hereby:
+ #ifdef USE_WATCHDOG
+   // you cannot reboot on a mega2560 due to a bug in he bootloader. Hence, you have to reset manually, and this is done hereby:
 -  #define RESET_MANUAL
 -  #define WATCHDOG_TIMEOUT 4  //seconds
 -#endif
 -
 +//#define RESET_MANUAL
 +//#define WATCHDOG_TIMEOUT 4  //seconds
  
+ 
  // extruder advance constant (s2/mm3)
  //
  // advance (steps) = STEPS_PER_CUBIC_MM_E * EXTUDER_ADVANCE_K * cubic mm per second ^ 2

diff --cc Marlin/Marlin.pde
index 3a6d4e6724d1d80ba396646153fe84caed8a04fa,f808742c9ccc1e82a9559df14ea1db6536a712ab..128f6976f2dc1e7bb5971d3eacfaceda95eab772
--- 1/Marlin/Marlin.pde
--- 2/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@@ -232,9 -239,11 +239,10 @@@ void setup(
      axis_steps_per_sqr_second[i] = max_acceleration_units_per_sq_second[i] * axis_steps_per_unit[i];
    }
  
 -  
 +  tp_init();    // Initialize temperature loop 
    plan_init();  // Initialize planner;
    st_init();    // Initialize stepper;
 -  tp_init();    // Initialize temperature loop
+   wd_init();
  }
  
  

diff --cc Marlin/watchdog.pde
Simple merge