Browse Source

Make wait_for_heatup volatile

Scott Lahteine 8 years ago
parent
commit
2ee4e4f791
3 changed files with 2 additions and 4 deletions
  1. 1
    1
      Marlin/Marlin.h
  2. 1
    1
      Marlin/Marlin_main.cpp
  3. 0
    2
      Marlin/ultralcd.h

+ 1
- 1
Marlin/Marlin.h View File

286
 extern float sw_endstop_max[3]; // axis[n].sw_endstop_max
286
 extern float sw_endstop_max[3]; // axis[n].sw_endstop_max
287
 extern bool axis_known_position[3]; // axis[n].is_known
287
 extern bool axis_known_position[3]; // axis[n].is_known
288
 extern bool axis_homed[3]; // axis[n].is_homed
288
 extern bool axis_homed[3]; // axis[n].is_homed
289
-extern bool wait_for_heatup;
289
+extern volatile bool wait_for_heatup;
290
 
290
 
291
 // GCode support for external objects
291
 // GCode support for external objects
292
 bool code_seen(char);
292
 bool code_seen(char);

+ 1
- 1
Marlin/Marlin_main.cpp View File

332
 // Relative Mode. Enable with G91, disable with G90.
332
 // Relative Mode. Enable with G91, disable with G90.
333
 static bool relative_mode = false;
333
 static bool relative_mode = false;
334
 
334
 
335
-bool wait_for_heatup = true;
335
+volatile bool wait_for_heatup = true;
336
 
336
 
337
 const char errormagic[] PROGMEM = "Error:";
337
 const char errormagic[] PROGMEM = "Error:";
338
 const char echomagic[] PROGMEM = "echo:";
338
 const char echomagic[] PROGMEM = "echo:";

+ 0
- 2
Marlin/ultralcd.h View File

95
   extern int absPreheatHPBTemp;
95
   extern int absPreheatHPBTemp;
96
   extern int absPreheatFanSpeed;
96
   extern int absPreheatFanSpeed;
97
 
97
 
98
-  extern bool wait_for_heatup;
99
-
100
   #if ENABLED(FILAMENT_LCD_DISPLAY)
98
   #if ENABLED(FILAMENT_LCD_DISPLAY)
101
     extern millis_t previous_lcd_status_ms;
99
     extern millis_t previous_lcd_status_ms;
102
   #endif
100
   #endif

Loading…
Cancel
Save