Bläddra i källkod

Followup to wait_for_user fix

Scott Lahteine 5 år sedan
förälder
incheckning
12503fce06
3 ändrade filer med 5 tillägg och 3 borttagningar
  1. 1
    1
      Marlin/src/Marlin.cpp
  2. 1
    1
      Marlin/src/Marlin.h
  3. 3
    1
      Marlin/src/feature/emergency_parser.h

+ 1
- 1
Marlin/src/Marlin.cpp Visa fil

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

+ 1
- 1
Marlin/src/Marlin.h Visa fil

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

+ 3
- 1
Marlin/src/feature/emergency_parser.h Visa fil

@@ -31,7 +31,9 @@
31 31
   #include "host_actions.h"
32 32
 #endif
33 33
 
34
-#include "../Marlin.h"
34
+// External references
35
+extern bool wait_for_user, wait_for_heatup;
36
+void quickstop_stepper();
35 37
 
36 38
 class EmergencyParser {
37 39
 

Laddar…
Avbryt
Spara