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

master
Neil Darlow 10 years ago
commit 3f2c771d90

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

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

Loading…
Cancel
Save