zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Neil Darlow 2014-07-07 18:17:15 +01:00
parent 6e3406d228 ce517df702
commit 3f2c771d90
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;
#endif
bool cancel_heatup = false ;
//===========================================================================
//=============================Private Variables=============================
//===========================================================================

2
Marlin/ultralcd.cpp
View file

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