Merge pull request #4472 from thinkyhead/rc_old_conditional

Make Conditionals.h a catch-all for old configs
8 years ago · a406b176b0
parent bfbd01e29a 83d341c394
commit a406b176b0
2 changed files with 2 additions and 2 deletions
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals.h
@ -24,4 +24,4 @@
 * Conditionals.h
 * OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.h
 */
-#include "SanityCheck.h"
+#error "Old configurations? Please delete all #include lines from Configuration.h and Configuration_adv.h."
--- a/Marlin/MarlinSerial.cpp
+++ b/Marlin/MarlinSerial.cpp
@ -451,7 +451,7 @@ MarlinSerial customizedSerial;
 #if ENABLED(EMERGENCY_PARSER)

  // Currently looking for: M108, M112, M410
-  // If you alter the parser please don't forget to update the capabilities in Conditionals.h
+  // If you alter the parser please don't forget to update the capabilities in Conditionals_post.h

  FORCE_INLINE void emergency_parser(unsigned char c) {