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

2014-07-01 10:27:39 +01:00
parent 9d11b70436 43c298a7a9
commit 6e3406d228
7 changed files with 206 additions and 5 deletions
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@ -43,6 +43,8 @@
  extern int absPreheatHotendTemp;
  extern int absPreheatHPBTemp;
  extern int absPreheatFanSpeed;
+  
+  extern bool cancel_heatup;
    
  void lcd_buzz(long duration,uint16_t freq);
  bool lcd_clicked();