|
@@ -56,18 +56,18 @@ void minkill(const bool steppers_off=false);
|
56
|
56
|
|
57
|
57
|
// Global State of the firmware
|
58
|
58
|
enum MarlinState : uint8_t {
|
59
|
|
- MF_INITIALIZING = 0,
|
60
|
|
- MF_RUNNING = _BV(0),
|
61
|
|
- MF_PAUSED = _BV(1),
|
62
|
|
- MF_WAITING = _BV(2),
|
63
|
|
- MF_STOPPED = _BV(3),
|
64
|
|
- MF_SD_COMPLETE = _BV(4),
|
65
|
|
- MF_KILLED = _BV(7)
|
|
59
|
+ MF_INITIALIZING = 0,
|
|
60
|
+ MF_STOPPED,
|
|
61
|
+ MF_KILLED,
|
|
62
|
+ MF_RUNNING,
|
|
63
|
+ MF_SD_COMPLETE,
|
|
64
|
+ MF_PAUSED,
|
|
65
|
+ MF_WAITING,
|
66
|
66
|
};
|
67
|
67
|
|
68
|
68
|
extern MarlinState marlin_state;
|
69
|
|
-inline bool IsRunning() { return marlin_state == MF_RUNNING; }
|
70
|
|
-inline bool IsStopped() { return marlin_state != MF_RUNNING; }
|
|
69
|
+inline bool IsRunning() { return marlin_state >= MF_RUNNING; }
|
|
70
|
+inline bool IsStopped() { return marlin_state == MF_STOPPED; }
|
71
|
71
|
|
72
|
72
|
bool printingIsActive();
|
73
|
73
|
bool printingIsPaused();
|