Reorganize some core headers (#11983)

This commit is contained in:
Scott Lahteine
2018-10-02 04:25:46 -05:00
committed by GitHub
parent ab4549d2bc
commit 0dedb3e139
14 changed files with 194 additions and 208 deletions

View File

@ -19,9 +19,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#pragma once
#ifndef _MARLIN_CONFIG_H_
#define _MARLIN_CONFIG_H_
//
// Prefix header for all Marlin sources
//
#include "MarlinConfigPre.h"
@ -43,6 +45,3 @@
#include "../core/language.h"
#include "../core/utility.h"
#include "../core/serial.h"
#include "../core/minmax.h"
#endif // _MARLIN_CONFIG_H_

View File

@ -19,19 +19,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
#pragma once
#ifndef _MARLIN_CONFIGPRE_H_
#define _MARLIN_CONFIGPRE_H_
//
// Prefix header to acquire configurations
//
#include "../HAL/platforms.h"
#include "../core/boards.h"
#include "../core/macros.h"
#include "../core/types.h"
#include "../core/config.h"
#include "Version.h"
#include "../../Configuration.h"
#include "Conditionals_LCD.h"
#include "../core/drivers.h"
#include "../../Configuration_adv.h"
#include "Conditionals_adv.h"
#endif // _MARLIN_CONFIGPRE_H_
#include "../core/macros.h"

View File

@ -23,7 +23,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#include "../core/macros.h" // for ENABLED
#include "../core/config.h" // for ENABLED
/**
* This file is the standard Marlin version identifier file.