From 12503fce063d968de4316254f91ab1eb39ff8b48 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 10 Mar 2019 09:13:54 -0500 Subject: [PATCH] Followup to wait_for_user fix --- Marlin/src/Marlin.cpp | 2 +- Marlin/src/Marlin.h | 2 +- Marlin/src/feature/emergency_parser.h | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Marlin/src/Marlin.cpp b/Marlin/src/Marlin.cpp index 7a3e815068..2f022ec15f 100644 --- a/Marlin/src/Marlin.cpp +++ b/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 diff --git a/Marlin/src/Marlin.h b/Marlin/src/Marlin.h index cfb5f9b317..1546d0be47 100644 --- a/Marlin/src/Marlin.h +++ b/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; diff --git a/Marlin/src/feature/emergency_parser.h b/Marlin/src/feature/emergency_parser.h index 710e515871..3ce5dfc7cf 100644 --- a/Marlin/src/feature/emergency_parser.h +++ b/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 {