melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Followup to wait_for_user fix

Browse Source
This commit is contained in:
Scott Lahteine 2019-03-10 09:13:54 -05:00
parent 33a08fc6f7
commit 12503fce06
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/Marlin.cpp
View File

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

2
Marlin/src/Marlin.h
View File

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

4
Marlin/src/feature/emergency_parser.h
View File

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