Browse Source

Make Conditionals.h a catch-all for old configs

Scott Lahteine 8 years ago
parent
commit
83d341c394
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/Conditionals.h
  2. 1
    1
      Marlin/MarlinSerial.cpp

+ 1
- 1
Marlin/Conditionals.h View File

24
  * Conditionals.h
24
  * Conditionals.h
25
  * OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.h
25
  * OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.h
26
  */
26
  */
27
-#include "SanityCheck.h"
27
+#error "Old configurations? Please delete all #include lines from Configuration.h and Configuration_adv.h."

+ 1
- 1
Marlin/MarlinSerial.cpp View File

451
 #if ENABLED(EMERGENCY_PARSER)
451
 #if ENABLED(EMERGENCY_PARSER)
452
 
452
 
453
   // Currently looking for: M108, M112, M410
453
   // Currently looking for: M108, M112, M410
454
-  // If you alter the parser please don't forget to update the capabilities in Conditionals.h
454
+  // If you alter the parser please don't forget to update the capabilities in Conditionals_post.h
455
 
455
 
456
   FORCE_INLINE void emergency_parser(unsigned char c) {
456
   FORCE_INLINE void emergency_parser(unsigned char c) {
457
 
457
 

Loading…
Cancel
Save