From 8a44928df3cff0a692713c39bef726c6ddbd0aac Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 25 Jul 2016 23:12:03 -0700
Subject: [PATCH] Make Conditionals.h a catch-all for old configs
---
Marlin/{Conditionals.h => Conditionals_post.h} | 8 ++++----
Marlin/MarlinConfig.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
rename Marlin/{Conditionals.h => Conditionals_post.h} (99%)
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals_post.h
similarity index 99%
rename from Marlin/Conditionals.h
rename to Marlin/Conditionals_post.h
index e593d79c95..fc0c6d54a6 100644
--- a/Marlin/Conditionals.h
+++ b/Marlin/Conditionals_post.h
@@ -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
diff --git a/Marlin/MarlinConfig.h b/Marlin/MarlinConfig.h
index 16099895a2..c3d0c3f9eb 100644
--- a/Marlin/MarlinConfig.h
+++ b/Marlin/MarlinConfig.h
@@ -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
--
GitLab