Browse Source

Make wait_for_heatup volatile

pull/1/head
Scott Lahteine 8 years ago
parent
commit
2ee4e4f791
  1. 2
      Marlin/Marlin.h
  2. 2
      Marlin/Marlin_main.cpp
  3. 2
      Marlin/ultralcd.h

2
Marlin/Marlin.h

@ -286,7 +286,7 @@ extern float sw_endstop_min[3]; // axis[n].sw_endstop_min
extern float sw_endstop_max[3]; // axis[n].sw_endstop_max extern float sw_endstop_max[3]; // axis[n].sw_endstop_max
extern bool axis_known_position[3]; // axis[n].is_known extern bool axis_known_position[3]; // axis[n].is_known
extern bool axis_homed[3]; // axis[n].is_homed extern bool axis_homed[3]; // axis[n].is_homed
extern bool wait_for_heatup; extern volatile bool wait_for_heatup;
// GCode support for external objects // GCode support for external objects
bool code_seen(char); bool code_seen(char);

2
Marlin/Marlin_main.cpp

@ -332,7 +332,7 @@ uint8_t active_extruder = 0;
// Relative Mode. Enable with G91, disable with G90. // Relative Mode. Enable with G91, disable with G90.
static bool relative_mode = false; static bool relative_mode = false;
bool wait_for_heatup = true; volatile bool wait_for_heatup = true;
const char errormagic[] PROGMEM = "Error:"; const char errormagic[] PROGMEM = "Error:";
const char echomagic[] PROGMEM = "echo:"; const char echomagic[] PROGMEM = "echo:";

2
Marlin/ultralcd.h

@ -95,8 +95,6 @@
extern int absPreheatHPBTemp; extern int absPreheatHPBTemp;
extern int absPreheatFanSpeed; extern int absPreheatFanSpeed;
extern bool wait_for_heatup;
#if ENABLED(FILAMENT_LCD_DISPLAY) #if ENABLED(FILAMENT_LCD_DISPLAY)
extern millis_t previous_lcd_status_ms; extern millis_t previous_lcd_status_ms;
#endif #endif

Loading…
Cancel
Save