3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Initial conflict resolution of SD_REPRINT_LAST_SELECTED_FILE (#8104)

Browse source 
* Initial conflict resolution

All previous items resolved:
- Use of ELAPSED() on timer code
- Switch to use of defer_return_to_status=true as much as possible
- Update & Clean Up of Max7219 routines

* Resolve non-SD case in ultralcd.cpp
This commit is contained in:
Roxy-3D 2017-10-26 11:44:55 -05:00 • committed by GitHub
parent 594c075377
commit 2e746f2b8b
35 changed files with 811 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Marlin/Configuration_adv.h
View file

@ -548,11 +548,22 @@
// Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES
// This option allows you to abort SD printing when any endstop is triggered.
// This feature must be enabled with "M540 S1" or from the LCD menu.
// To have any effect, endstops must be enabled during SD printing.
/**
* This option allows you to abort SD printing when any endstop is triggered.
* This feature must be enabled with "M540 S1" or from the LCD menu.
* To have any effect, endstops must be enabled during SD printing.
*/
//#define ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED
/**
* This option allows you to easily reprint the same SD Card file as
* was last printed. At the end of a print, the LCD Menu will jump
* straight to the file previously selected. A single click of the encoder
* wheel will restart the print. Another file or LCD option can be
* selected by using the encoder wheel to navigate through the menu structure.
*/
//#define SD_REPRINT_LAST_SELECTED_FILE
#endif // SDSUPPORT
/**