bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Reprint option for last SD Memory card file (#8106)

Browse Source 
* Re-Print of same SD Memory Card file with single click

* Re-Print of same SD Memory Card file with single click
* This is the bugfix-v2.0.0 version of  https://github.com/MarlinFirmware/Marlin/pull/8104
This commit is contained in:
Roxy-3D 2017-10-26 15:50:18 -05:00 committed by GitHub
parent 9e699811d2
commit 3f5f39576b
36 changed files with 503 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/default/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/AlephObjects/TAZ4/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Anet/A6/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Anet/A8/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/BQ/Hephestos/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/BQ/Hephestos_2/Configuration_adv.h
View File

@ -559,11 +559,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/BQ/WITBOX/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Cartesio/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Creality/CR-10/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Felix/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

0
Marlin/src/config/examples/Folger Tech/i3-2020/Configuration.h → Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
View File

17
Marlin/src/config/examples/Folger Tech/i3-2020/Configuration_adv.h → Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Infitary/i3-M508/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

20
Marlin/src/config/examples/Malyan/M150/Configuration_adv.h
View File

@ -556,14 +556,22 @@
// This allows hosts to request long names for files and folders with M33 // This allows hosts to request long names for files and folders with M33
#define LONG_FILENAME_HOST_SUPPORT #define LONG_FILENAME_HOST_SUPPORT
// 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.
// This option allows you to abort SD printing when any endstop is triggered. * To have any effect, endstops must be enabled during SD printing.
// 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Micromake/C1/enhanced/Configuration_adv.h
View File

@ -563,11 +563,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Mks/Sbase/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/RigidBot/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/SCARA/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Sanguinololu/Configuration_adv.h
View File

@ -551,11 +551,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/TinyBoy2/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Velleman/K8200/Configuration_adv.h
View File

@ -570,11 +570,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/Velleman/K8400/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration_adv.h
View File

@ -564,11 +564,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration_adv.h
View File

@ -564,11 +564,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/delta/generic/Configuration_adv.h
View File

@ -564,11 +564,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/delta/kossel_mini/Configuration_adv.h
View File

@ -564,11 +564,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/delta/kossel_pro/Configuration_adv.h
View File

@ -569,11 +569,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/delta/kossel_xl/Configuration_adv.h
View File

@ -564,11 +564,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/gCreate/gMax1.5+/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/makibox/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/tvrrug/Round2/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

17
Marlin/src/config/examples/wt150/Configuration_adv.h
View File

@ -562,11 +562,22 @@
// Enable this option to scroll long filenames in the SD card menu // Enable this option to scroll long filenames in the SD card menu
//#define SCROLL_LONG_FILENAMES //#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. * This option allows you to abort SD printing when any endstop is triggered.
// To have any effect, endstops must be enabled during SD printing. * 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 //#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 #endif // SDSUPPORT
/** /**

11
Marlin/src/feature/Max7219_Debug_LEDs.cpp
View File

@ -328,14 +328,11 @@ void Max7219_idle_tasks() {
#endif #endif
#if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE) #if ENABLED(MAX7219_DEBUG_PRINTER_ALIVE)
static int debug_cnt = 0; static millis_t next_blink = 0;
#ifdef CPU_32_BIT
if (debug_cnt++ > 1000) { if (ELAPSED(millis(), next_blink)) {
#else
if (debug_cnt++ > 100) {
#endif
Max7219_LED_Toggle(7, 7); Max7219_LED_Toggle(7, 7);
debug_cnt = 0; next_blink = millis() + 750;
} }
#endif #endif

33
Marlin/src/lcd/ultralcd.cpp
View File

@ -3742,10 +3742,25 @@ void kill_screen(const char* lcd_msg) {
* "Print from SD" submenu * "Print from SD" submenu
* *
*/ */
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
uint32_t saved_encoderPosition = 0;
static millis_t assume_print_finished = 0;
#endif
void lcd_sdcard_menu() { void lcd_sdcard_menu() {
ENCODER_DIRECTION_MENUS(); ENCODER_DIRECTION_MENUS();
if (!lcdDrawUpdate && !lcd_clicked) return; // nothing to do (so don't thrash the SD card)
const uint16_t fileCnt = card.get_num_Files(); #if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
if (ELAPSED(millis(), assume_print_finished)) { // if the printer has been busy printing, lcd_sdcard_menu() should not
lcdDrawUpdate = LCDVIEW_REDRAW_NOW; // have been active for 5 seconds. In this case, restore the previous
encoderPosition = saved_encoderPosition; // encoderPosition to the last selected item.
assume_print_finished = millis() + 5000;
}
saved_encoderPosition = encoderPosition;
defer_return_to_status = true;
#endif
const uint16_t fileCnt = card.getnrfilenames();
START_MENU(); START_MENU();
MENU_BACK(MSG_MAIN); MENU_BACK(MSG_MAIN);
card.getWorkDirName(); card.getWorkDirName();
@ -4395,6 +4410,9 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
void menu_action_sdfile(const char* filename, char* longFilename) { void menu_action_sdfile(const char* filename, char* longFilename) {
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
saved_encoderPosition = encoderPosition; // Save which file was selected for later use
#endif
UNUSED(longFilename); UNUSED(longFilename);
card.openAndPrintFile(filename); card.openAndPrintFile(filename);
lcd_return_to_status(); lcd_return_to_status();
@ -4702,7 +4720,11 @@ void lcd_update() {
uint16_t bbr2 = planner.block_buffer_runtime() >> 1; uint16_t bbr2 = planner.block_buffer_runtime() >> 1;
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
if ((lcdDrawUpdate || drawing_screen) && (!bbr2 || (bbr2 > max_display_update_time))) if ((lcdDrawUpdate || drawing_screen) && (!bbr2 || (bbr2 > max_display_update_time)
#if ENABLED(SDSUPPORT)
|| (currentScreen == lcd_sdcard_menu)
#endif
))
#else #else
if (lcdDrawUpdate && (!bbr2 || (bbr2 > max_display_update_time))) if (lcdDrawUpdate && (!bbr2 || (bbr2 > max_display_update_time)))
#endif #endif
@ -4756,7 +4778,12 @@ void lcd_update() {
// Return to Status Screen after a timeout // Return to Status Screen after a timeout
if (currentScreen == lcd_status_screen || defer_return_to_status) if (currentScreen == lcd_status_screen || defer_return_to_status)
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
if (currentScreen != lcd_sdcard_menu) // lcd_sdcard_menu() does not time out if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS; // When the printer finishes a file, it will wait with the file selected for
#else // a re-print.
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS; return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
#endif
else if (ELAPSED(ms, return_to_status_ms)) else if (ELAPSED(ms, return_to_status_ms))
lcd_return_to_status(); lcd_return_to_status();

21
Marlin/src/sd/cardreader.cpp
View File

@ -892,6 +892,15 @@ uint16_t CardReader::get_num_Files() {
; ;
} }
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
typedef void (*screenFunc_t)();
extern void lcd_sdcard_menu();
extern void lcd_goto_screen(screenFunc_t screen, const uint32_t encoder = 0);
extern uint32_t saved_encoderPosition;
extern bool screen_changed, drawing_screen, defer_return_to_status;
void _lcd_synchronize(); // Not declared in any LCD header file. Probably, that should be changed.
#endif
void CardReader::printingHasFinished() { void CardReader::printingHasFinished() {
stepper.synchronize(); stepper.synchronize();
file.close(); file.close();
@ -911,6 +920,18 @@ void CardReader::printingHasFinished() {
#if ENABLED(SDCARD_SORT_ALPHA) #if ENABLED(SDCARD_SORT_ALPHA)
presort(); presort();
#endif #endif
#if ENABLED(SD_REPRINT_LAST_SELECTED_FILE)
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
_lcd_synchronize();
safe_delay(50);
_lcd_synchronize();
lcdDrawUpdate = LCDVIEW_CALL_REDRAW_NEXT;
drawing_screen = screen_changed = true;
lcd_goto_screen(lcd_sdcard_menu, saved_encoderPosition);
defer_return_to_status = true;
lcd_update();
#endif
} }
} }