From 83d341c39408b0ec2bedabdb9fd7545049f4cba6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 30 Jul 2016 04:25:30 -0700 Subject: [PATCH] Make Conditionals.h a catch-all for old configs --- Marlin/Conditionals.h | 2 +- Marlin/MarlinSerial.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index baa822d7f..ff6c6b187 100644 --- 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." diff --git a/Marlin/MarlinSerial.cpp b/Marlin/MarlinSerial.cpp index d2f5623cb..304b3be07 100644 --- 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) {