Browse Source

Make SanityCheck.h a catch-all for obsolete configs

Scott Lahteine 8 years ago
parent
commit
3be49881c0
3 changed files with 28 additions and 6 deletions
  1. 1
    2
      Marlin/Conditionals.h
  2. 0
    4
      Marlin/Marlin.h
  3. 27
    0
      Marlin/SanityCheck.h

+ 1
- 2
Marlin/Conditionals.h View File

@@ -24,5 +24,4 @@
24 24
  * Conditionals.h
25 25
  * OBSOLETE: Replaced by Conditionals_LCD.h and Conditionals_post.h
26 26
  */
27
-
28
-#error "Please remove the following #include's from your Configuration.h and Configuration_adv.h: macros.h boards.h Conditionals.h Configuration_adv.h SanityCheck.h."
27
+#include "SanityCheck.h"

+ 0
- 4
Marlin/Marlin.h View File

@@ -37,10 +37,6 @@
37 37
 
38 38
 #include "fastio.h"
39 39
 
40
-#ifndef SANITYCHECK_H
41
-  #error "Your Configuration.h and Configuration_adv.h files are outdated!"
42
-#endif
43
-
44 40
 #include "enum.h"
45 41
 #include "utility.h"
46 42
 

+ 27
- 0
Marlin/SanityCheck.h View File

@@ -0,0 +1,27 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+/**
24
+ * SanityCheck.h
25
+ * OBSOLETE: Moved to SanityCheck.cpp
26
+ */
27
+#error "Please remove all #include lines from your Configuration.h and Configuration_adv.h files!"

Loading…
Cancel
Save