Merge upstream changes from Marlin 2.1.2.1
This commit is contained in:
@@ -34,20 +34,20 @@
|
||||
#include "../pins/pins.h"
|
||||
|
||||
#ifndef __MARLIN_DEPS__
|
||||
#include HAL_PATH(../HAL, timers.h)
|
||||
#include HAL_PATH(../HAL, spi_pins.h)
|
||||
#include HAL_PATH(.., timers.h)
|
||||
#include HAL_PATH(.., spi_pins.h)
|
||||
#endif
|
||||
|
||||
#include "Conditionals_post.h"
|
||||
|
||||
#ifndef __MARLIN_DEPS__
|
||||
|
||||
#include HAL_PATH(../HAL, inc/Conditionals_post.h)
|
||||
#include HAL_PATH(.., inc/Conditionals_post.h)
|
||||
|
||||
#include "../core/types.h" // Ahead of sanity-checks
|
||||
|
||||
#include "SanityCheck.h"
|
||||
#include HAL_PATH(../HAL, inc/SanityCheck.h)
|
||||
#include HAL_PATH(.., inc/SanityCheck.h)
|
||||
|
||||
// Include all core headers
|
||||
#include "../core/language.h"
|
||||
|
Reference in New Issue
Block a user