josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xflash_dump is now always required in all variants

This commit is contained in:
Yuri D'Elia 2021-06-12 15:13:32 +02:00
parent 449510392d
commit 01934b89e9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Marlin_main.cpp
View File

@ -109,9 +109,7 @@
#include "optiboot_xflash.h" #include "optiboot_xflash.h"
#endif //XFLASH #endif //XFLASH
#ifdef XFLASH_DUMP
#include "xflash_dump.h" #include "xflash_dump.h"
#endif
#ifdef BLINKM #ifdef BLINKM
#include "BlinkM.h" #include "BlinkM.h"

7
Firmware/ultralcd.cpp
View File

@ -30,6 +30,7 @@
#include "cmdqueue.h" #include "cmdqueue.h"
#include "SdFatUtil.h" #include "SdFatUtil.h"
#include "xflash_dump.h"
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
#include "pat9125.h" #include "pat9125.h"
@ -1804,8 +1805,6 @@ static void lcd_preheat_menu()
#ifdef MENU_DUMP #ifdef MENU_DUMP
#include "xflash_dump.h"
static void lcd_dump_memory() static void lcd_dump_memory()
{ {
lcd_beeper_quick_feedback(); lcd_beeper_quick_feedback();
@ -6722,9 +6721,7 @@ static void lcd_main_menu()
} }
#ifdef EMERGENCY_DUMP #ifdef EMERGENCY_SERIAL_DUMP
#include "xflash_dump.h"
#elif defined(EMERGENCY_SERIAL_DUMP)
#include "Dcodes.h" #include "Dcodes.h"
#endif #endif