Merge upstream changes from Marlin 2.1.2.1

This commit is contained in:
Stefan Kalscheuer
2023-05-26 18:48:34 +02:00
parent 22dedaeb81
commit f92a587638
620 changed files with 41015 additions and 28889 deletions

View File

@@ -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