SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #989 from bq/cancel_heatup

Browse source 
Changed the declaration of the variable "cancel_heatup" to Marlin_main.cpp to fix issue on commit #965
This commit is contained in:
alexborro 2014-07-01 13:21:53 -03:00
commit ce517df702
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View file

@ -276,6 +276,8 @@ int EtoPPressure=0;
float delta_segments_per_second= DELTA_SEGMENTS_PER_SECOND; float delta_segments_per_second= DELTA_SEGMENTS_PER_SECOND;
#endif #endif
bool cancel_heatup = false ;
//=========================================================================== //===========================================================================
//=============================Private Variables============================= //=============================Private Variables=============================
//=========================================================================== //===========================================================================

2
Marlin/ultralcd.cpp
View file

@ -19,8 +19,6 @@ int absPreheatHotendTemp;
int absPreheatHPBTemp; int absPreheatHPBTemp;
int absPreheatFanSpeed; int absPreheatFanSpeed;
bool cancel_heatup = false ;
#ifdef ULTIPANEL #ifdef ULTIPANEL
static float manual_feedrate[] = MANUAL_FEEDRATE; static float manual_feedrate[] = MANUAL_FEEDRATE;
#endif // ULTIPANEL #endif // ULTIPANEL