bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Unify config in a single include without nested includes

Browse Source
This commit is contained in:
Scott Lahteine
2016-07-25 23:04:19 -07:00
parent 2d378fac1b
commit c6226bb0aa
52 changed files with 87 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -1337,6 +1337,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/Cartesio/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/Felix/Configuration.h
View File

@ -1320,6 +1320,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -1318,6 +1318,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

4
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -1329,6 +1329,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/Hephestos/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -1331,6 +1331,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/Hephestos_2/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/K8200/Configuration.h
View File

@ -1354,6 +1354,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/K8200/Configuration_adv.h
View File

@ -52,8 +52,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -804,7 +802,4 @@ const unsigned int dropsegments = 2; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/K8400/Configuration.h
View File

@ -1337,6 +1337,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/K8400/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/K8400/Dual-head/Configuration.h
View File

@ -1337,6 +1337,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

4
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -1337,6 +1337,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

4
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -1337,6 +1337,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/RigidBot/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -1345,6 +1345,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -1358,6 +1358,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/TAZ4/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -806,7 +804,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -1329,6 +1329,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/WITBOX/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -1337,6 +1337,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

4
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

@ -1429,6 +1429,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -800,7 +798,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -1423,6 +1423,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -800,7 +798,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -1426,6 +1426,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -799,7 +797,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -1426,6 +1426,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
View File

@ -51,8 +51,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -804,7 +802,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -1429,6 +1429,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -800,7 +798,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/makibox/Configuration.h
View File

@ -1340,6 +1340,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H

4
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -1331,6 +1331,4 @@
//#define FILAMENT_LCD_DISPLAY
#endif
#include "Configuration_adv.h"
#endif //CONFIGURATION_H
#endif // CONFIGURATION_H

7
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -46,8 +46,6 @@
*/
#define CONFIGURATION_ADV_H_VERSION 010100
#include "Conditionals_LCD.h"
// @section temperature
//===========================================================================
@ -798,7 +796,4 @@ const unsigned int dropsegments = 5; //everything with less than this number of
//#define EXPERIMENTAL_I2CBUS
#include "Conditionals.h"
#include "SanityCheck.h"
#endif //CONFIGURATION_ADV_H
#endif // CONFIGURATION_ADV_H