3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 20:18:52 +00:00
Code Issues Releases Wiki Activity

Make Conditionals.h a catch-all for old configs

Browse Source
This commit is contained in:
Scott Lahteine 2016-07-25 23:12:03 -07:00
parent c6226bb0aa
commit 8a44928df3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/Conditionals.h → Marlin/Conditionals_post.h
View File

@ -21,12 +21,10 @@
*/
/**
* Conditionals.h
* Conditionals_post.h
* Defines that depend on configuration but are not editable.
*/
#ifndef CONDITIONALS_H
#define CONDITIONALS_H
#include "pins.h"
@ -36,6 +34,8 @@
#include "Arduino.h"
#include "macros.h"
#ifndef CONDITIONALS_POST_H
#define CONDITIONALS_POST_H
#if ENABLED(EMERGENCY_PARSER)
#define EMERGENCY_PARSER_CAPABILITIES " EMERGENCY_CODES:M108,M112,M410"
@ -675,4 +675,4 @@
#define Z_RAISE_BETWEEN_PROBING MIN_Z_HEIGHT_FOR_HOMING
#endif
#endif //CONDITIONALS_H
#endif // CONDITIONALS_POST_H

2
Marlin/MarlinConfig.h
View File

@ -26,7 +26,7 @@
#include "Configuration.h"
#include "Conditionals_LCD.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "Conditionals_post.h"
#include "SanityCheck.h"
#endif // MARLIN_CONFIG_H