Merge upstream changes from Marlin 2.1.1

2022-09-03 09:23:32 +02:00
parent 626283aadb
commit 986e416c7f
1610 changed files with 73839 additions and 40857 deletions
--- a/Marlin/src/lcd/menu/menu_power_monitor.cpp
+++ b/Marlin/src/lcd/menu/menu_power_monitor.cpp
@@ -26,7 +26,7 @@

 #include "../../inc/MarlinConfigPre.h"

-#if HAS_LCD_MENU && HAS_POWER_MONITOR
+#if HAS_MARLINUI_MENU && HAS_POWER_MONITOR

 #include "menu_item.h"
 #include "../../feature/power_monitor.h"
@@ -59,4 +59,4 @@ void menu_power_monitor() {
  END_MENU();
 }

-#endif // HAS_LCD_MENU && HAS_POWER_MONITOR
+#endif // HAS_MARLINUI_MENU && HAS_POWER_MONITOR