Merge upstream changes from Marlin 2.1.2.1
This commit is contained in:
@@ -49,7 +49,7 @@
|
||||
#include "Conditionals_LCD.h"
|
||||
|
||||
#ifndef __MARLIN_DEPS__
|
||||
#include HAL_PATH(../HAL, inc/Conditionals_LCD.h)
|
||||
#include HAL_PATH(.., inc/Conditionals_LCD.h)
|
||||
#endif
|
||||
|
||||
#include "../core/drivers.h"
|
||||
@@ -58,5 +58,5 @@
|
||||
#include "Conditionals_adv.h"
|
||||
|
||||
#ifndef __MARLIN_DEPS__
|
||||
#include HAL_PATH(../HAL, inc/Conditionals_adv.h)
|
||||
#include HAL_PATH(.., inc/Conditionals_adv.h)
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user