Browse Source

Followup to wait_for_user fix

pull/1/head
Scott Lahteine 6 years ago
parent
commit
12503fce06
  1. 2
      Marlin/src/Marlin.cpp
  2. 2
      Marlin/src/Marlin.h
  3. 4
      Marlin/src/feature/emergency_parser.h

2
Marlin/src/Marlin.cpp

@ -179,7 +179,7 @@ bool Running = true;
#endif
// For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
volatile bool wait_for_heatup = true;
bool wait_for_heatup = true;
// For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
#if HAS_RESUME_CONTINUE

2
Marlin/src/Marlin.h

@ -330,7 +330,7 @@ extern bool Running;
inline bool IsRunning() { return Running; }
inline bool IsStopped() { return !Running; }
extern volatile bool wait_for_heatup;
extern bool wait_for_heatup;
#if HAS_RESUME_CONTINUE
extern bool wait_for_user;

4
Marlin/src/feature/emergency_parser.h

@ -31,7 +31,9 @@
#include "host_actions.h"
#endif
#include "../Marlin.h"
// External references
extern bool wait_for_user, wait_for_heatup;
void quickstop_stepper();
class EmergencyParser {

Loading…
Cancel
Save