Browse Source

Remove enum.h include of MarlinConfig.h

Scott Lahteine 7 years ago
parent
commit
25af9decfe
5 changed files with 47 additions and 54 deletions
  1. 5
    0
      Marlin/src/Marlin.h
  2. 0
    53
      Marlin/src/core/enum.h
  3. 17
    0
      Marlin/src/core/serial.h
  4. 12
    0
      Marlin/src/lcd/ultralcd.h
  5. 13
    1
      Marlin/src/module/motion.h

+ 5
- 0
Marlin/src/Marlin.h View File

199
 #endif
199
 #endif
200
 
200
 
201
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
201
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
202
+  enum AdvancedPauseMenuResponse {
203
+    ADVANCED_PAUSE_RESPONSE_WAIT_FOR,
204
+    ADVANCED_PAUSE_RESPONSE_EXTRUDE_MORE,
205
+    ADVANCED_PAUSE_RESPONSE_RESUME_PRINT
206
+  };
202
   extern AdvancedPauseMenuResponse advanced_pause_menu_response;
207
   extern AdvancedPauseMenuResponse advanced_pause_menu_response;
203
 #endif
208
 #endif
204
 
209
 

+ 0
- 53
Marlin/src/core/enum.h View File

23
 #ifndef __ENUM_H__
23
 #ifndef __ENUM_H__
24
 #define __ENUM_H__
24
 #define __ENUM_H__
25
 
25
 
26
-#include "../inc/MarlinConfig.h"
27
-
28
 /**
26
 /**
29
  * Axis indices as enumerated constants
27
  * Axis indices as enumerated constants
30
  *
28
  *
69
   TEMPUNIT_F
67
   TEMPUNIT_F
70
 } TempUnit;
68
 } TempUnit;
71
 
69
 
72
-#if ENABLED(EMERGENCY_PARSER)
73
-  enum e_parser_state {
74
-    state_RESET,
75
-    state_N,
76
-    state_M,
77
-    state_M1,
78
-    state_M10,
79
-    state_M108,
80
-    state_M11,
81
-    state_M112,
82
-    state_M4,
83
-    state_M41,
84
-    state_M410,
85
-    state_IGNORE // to '\n'
86
-  };
87
-#endif
88
-
89
-#if ENABLED(ADVANCED_PAUSE_FEATURE)
90
-  enum AdvancedPauseMenuResponse {
91
-    ADVANCED_PAUSE_RESPONSE_WAIT_FOR,
92
-    ADVANCED_PAUSE_RESPONSE_EXTRUDE_MORE,
93
-    ADVANCED_PAUSE_RESPONSE_RESUME_PRINT
94
-  };
95
-
96
-  #if ENABLED(ULTIPANEL)
97
-    enum AdvancedPauseMessage {
98
-      ADVANCED_PAUSE_MESSAGE_INIT,
99
-      ADVANCED_PAUSE_MESSAGE_UNLOAD,
100
-      ADVANCED_PAUSE_MESSAGE_INSERT,
101
-      ADVANCED_PAUSE_MESSAGE_LOAD,
102
-      ADVANCED_PAUSE_MESSAGE_EXTRUDE,
103
-      ADVANCED_PAUSE_MESSAGE_OPTION,
104
-      ADVANCED_PAUSE_MESSAGE_RESUME,
105
-      ADVANCED_PAUSE_MESSAGE_STATUS,
106
-      ADVANCED_PAUSE_MESSAGE_CLICK_TO_HEAT_NOZZLE,
107
-      ADVANCED_PAUSE_MESSAGE_WAIT_FOR_NOZZLES_TO_HEAT
108
-    };
109
-  #endif
110
-#endif
111
-
112
 /**
70
 /**
113
  * SD Card
71
  * SD Card
114
  */
72
  */
125
   LCDVIEW_CALL_NO_REDRAW
83
   LCDVIEW_CALL_NO_REDRAW
126
 };
84
 };
127
 
85
 
128
-/**
129
- * Dual X Carriage modes. A Dual Nozzle can also do duplication.
130
- */
131
-#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
132
-  enum DualXMode {
133
-    DXC_FULL_CONTROL_MODE,  // DUAL_X_CARRIAGE only
134
-    DXC_AUTO_PARK_MODE,     // DUAL_X_CARRIAGE only
135
-    DXC_DUPLICATION_MODE
136
-  };
137
-#endif
138
-
139
 #endif // __ENUM_H__
86
 #endif // __ENUM_H__

+ 17
- 0
Marlin/src/core/serial.h View File

44
   DEBUG_ALL           = 0xFF
44
   DEBUG_ALL           = 0xFF
45
 };
45
 };
46
 
46
 
47
+#if ENABLED(EMERGENCY_PARSER)
48
+  enum e_parser_state {
49
+    state_RESET,
50
+    state_N,
51
+    state_M,
52
+    state_M1,
53
+    state_M10,
54
+    state_M108,
55
+    state_M11,
56
+    state_M112,
57
+    state_M4,
58
+    state_M41,
59
+    state_M410,
60
+    state_IGNORE // to '\n'
61
+  };
62
+#endif
63
+
47
 //todo: HAL: breaks encapsulation
64
 //todo: HAL: breaks encapsulation
48
 // For AVR only, define a serial interface based on configuration
65
 // For AVR only, define a serial interface based on configuration
49
 #ifdef __AVR__
66
 #ifdef __AVR__

+ 12
- 0
Marlin/src/lcd/ultralcd.h View File

108
     void lcd_completion_feedback(const bool good=true);
108
     void lcd_completion_feedback(const bool good=true);
109
 
109
 
110
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
110
     #if ENABLED(ADVANCED_PAUSE_FEATURE)
111
+      enum AdvancedPauseMessage {
112
+        ADVANCED_PAUSE_MESSAGE_INIT,
113
+        ADVANCED_PAUSE_MESSAGE_UNLOAD,
114
+        ADVANCED_PAUSE_MESSAGE_INSERT,
115
+        ADVANCED_PAUSE_MESSAGE_LOAD,
116
+        ADVANCED_PAUSE_MESSAGE_EXTRUDE,
117
+        ADVANCED_PAUSE_MESSAGE_OPTION,
118
+        ADVANCED_PAUSE_MESSAGE_RESUME,
119
+        ADVANCED_PAUSE_MESSAGE_STATUS,
120
+        ADVANCED_PAUSE_MESSAGE_CLICK_TO_HEAT_NOZZLE,
121
+        ADVANCED_PAUSE_MESSAGE_WAIT_FOR_NOZZLES_TO_HEAT
122
+      };
111
       void lcd_advanced_pause_show_message(const AdvancedPauseMessage message);
123
       void lcd_advanced_pause_show_message(const AdvancedPauseMessage message);
112
     #endif
124
     #endif
113
 
125
 

+ 13
- 1
Marlin/src/module/motion.h View File

292
  */
292
  */
293
 #if ENABLED(DUAL_X_CARRIAGE)
293
 #if ENABLED(DUAL_X_CARRIAGE)
294
 
294
 
295
+  enum DualXMode {
296
+    DXC_FULL_CONTROL_MODE,  // DUAL_X_CARRIAGE only
297
+    DXC_AUTO_PARK_MODE,     // DUAL_X_CARRIAGE only
298
+    DXC_DUPLICATION_MODE
299
+  };
300
+
295
   extern DualXMode dual_x_carriage_mode;
301
   extern DualXMode dual_x_carriage_mode;
296
   extern float inactive_extruder_x_pos,           // used in mode 0 & 1
302
   extern float inactive_extruder_x_pos,           // used in mode 0 & 1
297
                raised_parked_position[XYZE],      // used in mode 1
303
                raised_parked_position[XYZE],      // used in mode 1
304
 
310
 
305
   FORCE_INLINE int x_home_dir(const uint8_t extruder) { return extruder ? X2_HOME_DIR : X_HOME_DIR; }
311
   FORCE_INLINE int x_home_dir(const uint8_t extruder) { return extruder ? X2_HOME_DIR : X_HOME_DIR; }
306
 
312
 
307
-#endif // DUAL_X_CARRIAGE
313
+#elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
314
+
315
+  enum DualXMode {
316
+    DXC_DUPLICATION_MODE = 2
317
+  };
318
+
319
+#endif
308
 
320
 
309
 #if HAS_WORKSPACE_OFFSET || ENABLED(DUAL_X_CARRIAGE)
321
 #if HAS_WORKSPACE_OFFSET || ENABLED(DUAL_X_CARRIAGE)
310
   void update_software_endstops(const AxisEnum axis);
322
   void update_software_endstops(const AxisEnum axis);

Loading…
Cancel
Save