Browse Source

Make Conditionals.h a catch-all for old configs

Scott Lahteine 9 years ago
parent
commit
8a44928df3
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      Marlin/Conditionals_post.h
  2. 1
    1
      Marlin/MarlinConfig.h

Marlin/Conditionals.h → Marlin/Conditionals_post.h View File

21
  */
21
  */
22
 
22
 
23
 /**
23
 /**
24
- * Conditionals.h
24
+ * Conditionals_post.h
25
  * Defines that depend on configuration but are not editable.
25
  * Defines that depend on configuration but are not editable.
26
  */
26
  */
27
 
27
 
28
-#ifndef CONDITIONALS_H
29
-#define CONDITIONALS_H
30
 
28
 
31
   #include "pins.h"
29
   #include "pins.h"
32
 
30
 
36
   #include "Arduino.h"
34
   #include "Arduino.h"
37
 
35
 
38
   #include "macros.h"
36
   #include "macros.h"
37
+#ifndef CONDITIONALS_POST_H
38
+#define CONDITIONALS_POST_H
39
 
39
 
40
   #if ENABLED(EMERGENCY_PARSER)
40
   #if ENABLED(EMERGENCY_PARSER)
41
     #define EMERGENCY_PARSER_CAPABILITIES " EMERGENCY_CODES:M108,M112,M410"
41
     #define EMERGENCY_PARSER_CAPABILITIES " EMERGENCY_CODES:M108,M112,M410"
675
     #define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
675
     #define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
676
   #endif
676
   #endif
677
 
677
 
678
-#endif //CONDITIONALS_H
678
+#endif // CONDITIONALS_POST_H

+ 1
- 1
Marlin/MarlinConfig.h View File

26
 #include "Configuration.h"
26
 #include "Configuration.h"
27
 #include "Conditionals_LCD.h"
27
 #include "Conditionals_LCD.h"
28
 #include "Configuration_adv.h"
28
 #include "Configuration_adv.h"
29
-#include "Conditionals.h"
29
+#include "Conditionals_post.h"
30
 #include "SanityCheck.h"
30
 #include "SanityCheck.h"
31
 
31
 
32
 #endif // MARLIN_CONFIG_H
32
 #endif // MARLIN_CONFIG_H

Loading…
Cancel
Save