SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4472 from thinkyhead/rc_old_conditional

Browse source 
Make Conditionals.h a catch-all for old configs
This commit is contained in:
Scott Lahteine 2016-07-30 04:34:43 -07:00 committed by GitHub
commit a406b176b0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Conditionals.h
View file

@ -24,4 +24,4 @@
* Conditionals.h * Conditionals.h
* OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.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
View file

@ -451,7 +451,7 @@ MarlinSerial customizedSerial;
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER)
// Currently looking for: M108, M112, M410 // 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) { FORCE_INLINE void emergency_parser(unsigned char c) {