Преглед изворни кода

Followup to wait_for_user fix

Scott Lahteine пре 6 година
родитељ
комит
12503fce06
3 измењених фајлова са 5 додато и 3 уклоњено
  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 Прегледај датотеку

179
 #endif
179
 #endif
180
 
180
 
181
 // For M109 and M190, this flag may be cleared (by M108) to exit the wait loop
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
 // For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
184
 // For M0/M1, this flag may be cleared (by M108) to exit the wait-for-user loop
185
 #if HAS_RESUME_CONTINUE
185
 #if HAS_RESUME_CONTINUE

+ 1
- 1
Marlin/src/Marlin.h Прегледај датотеку

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

+ 3
- 1
Marlin/src/feature/emergency_parser.h Прегледај датотеку

31
   #include "host_actions.h"
31
   #include "host_actions.h"
32
 #endif
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
 class EmergencyParser {
38
 class EmergencyParser {
37
 
39
 

Loading…
Откажи
Сачувај