浏览代码

Update MF states

Scott Lahteine 4 年前
父节点
当前提交
a03811f4e8
共有 1 个文件被更改,包括 9 次插入9 次删除
  1. 9
    9
      Marlin/src/MarlinCore.h

+ 9
- 9
Marlin/src/MarlinCore.h 查看文件

56
 
56
 
57
 // Global State of the firmware
57
 // Global State of the firmware
58
 enum MarlinState : uint8_t {
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
 extern MarlinState marlin_state;
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
 bool printingIsActive();
72
 bool printingIsActive();
73
 bool printingIsPaused();
73
 bool printingIsPaused();

正在加载...
取消
保存