SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/Configuration.h
View file

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

5
Marlin/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

3
Marlin/Marlin.h
View file

@ -39,8 +39,9 @@
#include <avr/eeprom.h>
#include <avr/interrupt.h>
#include "MarlinConfig.h"
#include "fastio.h"
#include "Configuration.h"
#ifndef SANITYCHECK_H
#error "Your Configuration.h and Configuration_adv.h files are outdated!"

3
Marlin/Marlin.ino
View file

@ -34,8 +34,7 @@
/* All the implementation is done in *.cpp files to get better compatibility with avr-gcc without the Arduino IDE */
/* Use this file to help the Arduino IDE find which Arduino libraries are needed and to keep documentation on GCode */
#include "Configuration.h"
#include "pins.h"
#include "MarlinConfig.h"
#if ENABLED(ULTRA_LCD)
#if ENABLED(LCD_I2C_TYPE_PCF8575)

32
Marlin/MarlinConfig.h Normal file
View file

@ -0,0 +1,32 @@
/**
* Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef MARLIN_CONFIG_H
#define MARLIN_CONFIG_H
#include "Configuration.h"
#include "Conditionals_LCD.h"
#include "Configuration_adv.h"
#include "Conditionals.h"
#include "SanityCheck.h"
#endif // MARLIN_CONFIG_H

2
Marlin/configuration_store.h
View file

@ -23,7 +23,7 @@
#ifndef CONFIGURATION_STORE_H
#define CONFIGURATION_STORE_H
#include "Configuration.h"
#include "MarlinConfig.h"
void Config_ResetDefault();

3
Marlin/dac_mcp4728.h
View file

@ -27,8 +27,7 @@
#ifndef mcp4728_h
#define mcp4728_h
#include "Configuration.h"
#include "Configuration_adv.h"
#include "MarlinConfig.h"
#if ENABLED(DAC_STEPPER_CURRENT)
#include "Wire.h"

2
Marlin/digipot_mcp4451.cpp
View file

@ -20,7 +20,7 @@
*
*/
#include "Configuration.h"
#include "MarlinConfig.h"
#if ENABLED(DIGIPOT_I2C)

2
Marlin/example_configurations/Cartesio/Configuration.h
View file

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

5
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

2
Marlin/example_configurations/Felix/Configuration.h
View file

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

5
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

2
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

2
Marlin/example_configurations/Hephestos/Configuration.h
View file

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

5
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

2
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

5
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

2
Marlin/example_configurations/K8200/Configuration.h
View file

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

5
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

2
Marlin/example_configurations/K8400/Configuration.h
View file

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

5
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

2
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

2
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

2
Marlin/example_configurations/RigidBot/Configuration.h
View file

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

5
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

2
Marlin/example_configurations/SCARA/Configuration.h
View file

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

5
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

2
Marlin/example_configurations/TAZ4/Configuration.h
View file

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

5
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

2
Marlin/example_configurations/WITBOX/Configuration.h
View file

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

5
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

2
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

2
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

5
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

2
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

5
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

2
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

5
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

2
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

5
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

2
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

5
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

2
Marlin/example_configurations/makibox/Configuration.h
View file

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

5
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

2
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

5
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

2
Marlin/language.h
View file

@ -23,7 +23,7 @@
#ifndef LANGUAGE_H
#define LANGUAGE_H
#include "Configuration.h"
#include "MarlinConfig.h"
// Fallback if no language is set. DON'T CHANGE
#ifndef LCD_LANGUAGE

2
Marlin/qr_solve.h
View file

@ -20,7 +20,7 @@
*
*/
#include "Configuration.h"
#include "MarlinConfig.h"
#if ENABLED(AUTO_BED_LEVELING_GRID)

2
Marlin/servo.cpp
View file

@ -50,7 +50,7 @@
* detach() - Stop an attached servo from pulsing its i/o pin.
*
*/
#include "Configuration.h"
#include "MarlinConfig.h"
#if HAS_SERVOS

2
Marlin/stepper_indirection.cpp
View file

@ -43,7 +43,7 @@
#include "stepper_indirection.h"
#include "Configuration.h"
#include "MarlinConfig.h"
#if ENABLED(HAVE_TMCDRIVER)
#include <SPI.h>

2
Marlin/stepper_indirection.h
View file

@ -44,7 +44,7 @@
#ifndef STEPPER_INDIRECTION_H
#define STEPPER_INDIRECTION_H
#include "Configuration.h"
#include "MarlinConfig.h"
// TMC26X drivers have STEP/DIR on normal pins, but ENABLE via SPI
#if ENABLED(HAVE_TMCDRIVER)

9
Marlin/ultralcd_impl_DOGM.h
View file

@ -36,6 +36,8 @@
#ifndef ULTRALCD_IMPL_DOGM_H
#define ULTRALCD_IMPL_DOGM_H
#include "MarlinConfig.h"
/**
* Implementation of the LCD display routines for a DOGM128 graphic display.
* These are common LCD 128x64 pixel graphic displays.
@ -51,20 +53,17 @@
#define LCD_CLICKED (buttons&EN_C)
#endif
#include <U8glib.h>
#include "dogm_bitmaps.h"
#include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h"
#include "Configuration.h"
#include "duration_t.h"
#include <U8glib.h>
#if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT)
#undef USE_BIG_EDIT_FONT
#endif
#if ENABLED(USE_SMALL_INFOFONT)
#include "dogm_font_data_6x9_marlin.h"
#define FONT_STATUSMENU_NAME u8g_font_6x9