Merge pull request #989 from bq/cancel_heatup

Changed the declaration of the variable "cancel_heatup" to Marlin_main.cpp to fix issue on commit #965
11 years ago · ce517df702
parent 43c298a7a9 2242a84218
commit ce517df702
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