Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

11 years ago · 3f2c771d90
2 changed files with 2 additions and 2 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@ -276,6 +276,8 @@ int EtoPPressure=0;
  float delta_segments_per_second= DELTA_SEGMENTS_PER_SECOND;
 #endif					

+bool cancel_heatup = false ;
+
 //===========================================================================
 //=============================Private Variables=============================
 //===========================================================================
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@ -19,8 +19,6 @@ int absPreheatHotendTemp;
 int absPreheatHPBTemp;
 int absPreheatFanSpeed;

-bool cancel_heatup = false ;
-
 #ifdef ULTIPANEL
 static float manual_feedrate[] = MANUAL_FEEDRATE;
 #endif // ULTIPANEL