From 01934b89e931546ca9b1f54e82d12dd0461ca0b3 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 12 Jun 2021 15:13:32 +0200 Subject: [PATCH] xflash_dump is now always required in all variants --- Firmware/Marlin_main.cpp | 2 -- Firmware/ultralcd.cpp | 7 ++----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index afb9672d4..56a90849e 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -109,9 +109,7 @@ #include "optiboot_xflash.h" #endif //XFLASH -#ifdef XFLASH_DUMP #include "xflash_dump.h" -#endif #ifdef BLINKM #include "BlinkM.h" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index c98637879..caf9c47c0 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -30,6 +30,7 @@ #include "cmdqueue.h" #include "SdFatUtil.h" +#include "xflash_dump.h" #ifdef FILAMENT_SENSOR #include "pat9125.h" @@ -1804,8 +1805,6 @@ static void lcd_preheat_menu() #ifdef MENU_DUMP -#include "xflash_dump.h" - static void lcd_dump_memory() { lcd_beeper_quick_feedback(); @@ -6722,9 +6721,7 @@ static void lcd_main_menu() } -#ifdef EMERGENCY_DUMP -#include "xflash_dump.h" -#elif defined(EMERGENCY_SERIAL_DUMP) +#ifdef EMERGENCY_SERIAL_DUMP #include "Dcodes.h" #endif