Browse Source

Merge pull request #4472 from thinkyhead/rc_old_conditional

Make Conditionals.h a catch-all for old configs
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
a406b176b0
  1. 2
      Marlin/Conditionals.h
  2. 2
      Marlin/MarlinSerial.cpp

2
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."

2
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) {

Loading…
Cancel
Save