From 104ed2f503803b887489af51a3fb668b54db9d39 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Thu, 28 May 2015 15:57:27 +0200 Subject: [PATCH] config_wrapper.h: move #include "arduino.h" here. This #include "../arduino.h" was the only reason prohibiting Configtool users from storing printer and board configuration files wherever they wanted. Good reason to remove this restriciton. This also solves a part of issue #152. --- config/board.3drag.h | 2 -- config/board.gen3.h | 2 -- config/board.gen6.h | 2 -- config/board.gen7-v1.1-v1.3.h | 2 -- config/board.gen7-v1.4.h | 2 -- config/board.ramps-v1.2.h | 2 -- config/board.ramps-v1.3.h | 2 -- config/board.rumba.h | 2 -- config/board.sanguinololu-v1.1.h | 2 -- config/board.sanguinololu-v1.2.h | 2 -- config/board.sanguish.h | 2 -- config/board.teensy++-v2.0.h | 2 -- config/board.teensy-v2.0.h | 2 -- config_wrapper.h | 20 ++++++++++++++------ 14 files changed, 14 insertions(+), 32 deletions(-) diff --git a/config/board.3drag.h b/config/board.3drag.h index e045b85..40a3367 100644 --- a/config/board.3drag.h +++ b/config/board.3drag.h @@ -42,8 +42,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO54 #define X_DIR_PIN DIO55 #define X_MIN_PIN DIO3 diff --git a/config/board.gen3.h b/config/board.gen3.h index 35b7dff..d99ca30 100644 --- a/config/board.gen3.h +++ b/config/board.gen3.h @@ -42,8 +42,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO18 #define X_MIN_PIN DIO20 diff --git a/config/board.gen6.h b/config/board.gen6.h index 2744ad0..7d1054f 100644 --- a/config/board.gen6.h +++ b/config/board.gen6.h @@ -42,8 +42,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO18 #define X_MIN_PIN DIO20 diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h index 1ada02b..3dda4f6 100644 --- a/config/board.gen7-v1.1-v1.3.h +++ b/config/board.gen7-v1.1-v1.3.h @@ -46,8 +46,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO19 #define X_DIR_PIN DIO18 #define X_MIN_PIN DIO7 diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h index 1aeaa89..986b581 100644 --- a/config/board.gen7-v1.4.h +++ b/config/board.gen7-v1.4.h @@ -46,8 +46,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO29 #define X_DIR_PIN DIO28 #define X_MIN_PIN DIO0 diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h index e05eb94..e781927 100644 --- a/config/board.ramps-v1.2.h +++ b/config/board.ramps-v1.2.h @@ -43,8 +43,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO26 #define X_DIR_PIN DIO28 #define X_MIN_PIN DIO3 diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h index 770070d..8b0f4cd 100644 --- a/config/board.ramps-v1.3.h +++ b/config/board.ramps-v1.3.h @@ -43,8 +43,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO54 #define X_DIR_PIN DIO55 #define X_MIN_PIN DIO3 diff --git a/config/board.rumba.h b/config/board.rumba.h index 0f305f2..7f10734 100644 --- a/config/board.rumba.h +++ b/config/board.rumba.h @@ -42,8 +42,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO17 #define X_DIR_PIN DIO16 #define X_MIN_PIN DIO37 diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h index f5b95bc..8906127 100644 --- a/config/board.sanguinololu-v1.1.h +++ b/config/board.sanguinololu-v1.1.h @@ -45,8 +45,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO21 #define X_MIN_PIN DIO18 diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h index ac9981a..0736b69 100644 --- a/config/board.sanguinololu-v1.2.h +++ b/config/board.sanguinololu-v1.2.h @@ -45,8 +45,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO21 #define X_MIN_PIN DIO18 diff --git a/config/board.sanguish.h b/config/board.sanguish.h index 91da2a4..9bc746a 100644 --- a/config/board.sanguish.h +++ b/config/board.sanguish.h @@ -45,8 +45,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO28 #define X_DIR_PIN DIO27 #define X_MIN_PIN DIO2 diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h index 7f4e903..4a0b5b7 100644 --- a/config/board.teensy++-v2.0.h +++ b/config/board.teensy++-v2.0.h @@ -42,8 +42,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO28 #define X_DIR_PIN DIO29 #define X_MIN_PIN DIO2 diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h index aeb1336..ecefead 100644 --- a/config/board.teensy-v2.0.h +++ b/config/board.teensy-v2.0.h @@ -42,8 +42,6 @@ * * \***************************************************************************/ -#include "../arduino.h" - #define X_STEP_PIN DIO18 #define X_DIR_PIN DIO17 #define X_MIN_PIN DIO1 diff --git a/config_wrapper.h b/config_wrapper.h index bf3140a..31dab57 100644 --- a/config_wrapper.h +++ b/config_wrapper.h @@ -1,10 +1,18 @@ -/* - * This wrapper config header is used to allow makefiles and test scripts to - * replace or augment the user's 'config.h' file in a controlled manner. A - * makefile may add CFLAGS+=-DUSER_CONFIG=alternate_config.h to cause Teacup - * to build with a different config header. - */ +/** + Some stuff common to all config.h files. Put it here to allow files like + board.*.config.h or printer.*.h to be moved to about everywhere in the + file system. Else we'd have to enforce the Configtool user to put these + files where we need them. +*/ +#include "arduino.h" + +/** + This wrapper config header is used to allow makefiles and test scripts to + replace or augment the user's 'config.h' file in a controlled manner. A + makefile may add CFLAGS+=-DUSER_CONFIG=alternate_config.h to cause Teacup + to build with a different config header. +*/ #ifndef USER_CONFIG #define USER_CONFIG "config.h" #endif