microlab
/
scube
1
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge pull request #4472 from thinkyhead/rc_old_conditional

Browse Source 
Make Conditionals.h a catch-all for old configs
2.0.x
Scott Lahteine 8 years ago committed by GitHub
parent bfbd01e29a 83d341c394
commit a406b176b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
Marlin/Conditionals.h
Unescape Escape 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
Unescape Escape 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) {

Write Preview
Loading…
Cancel
Save