CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9208 from benlye/benlye-m73

Browse Source 
[2.0.x] Allow M73 without SDSUPPORT
This commit is contained in:
Scott Lahteine 2018-02-17 15:50:11 -06:00 committed by GitHub
commit 7a381366aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 147 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/Azteeg/X5GT/Configuration_adv.h
View File

@ -491,6 +491,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -581,9 +584,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/BIBO/TouchX/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/Creality/Ender/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/FolgerTech/i3-2020/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/JGAurora/A5/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/MakerParts/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
#define LCD_TIMEOUT_TO_STATUS 30000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/Malyan/M200/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -491,6 +491,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -581,9 +584,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/TheBorg/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/UltiMachine/Archim2/Configuration_adv.h
View File

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -503,6 +503,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -593,9 +596,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration_adv.h
View File

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
#define LCD_TIMEOUT_TO_STATUS 60000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

6
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration_adv.h
View File

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -497,6 +497,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -587,9 +590,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -492,6 +492,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -582,9 +585,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -490,6 +490,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -580,9 +583,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

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

@ -491,6 +491,9 @@
// The timeout (in ms) to return to the status screen from sub-menus
//#define LCD_TIMEOUT_TO_STATUS 15000
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
/**
* LED Control Menu
* Enable this feature to add LED Control to the LCD menu
@ -581,9 +584,6 @@
//#define LCD_PROGRESS_BAR_TEST
#endif
// Add an 'M73' G-code to set the current percentage
//#define LCD_SET_PROGRESS_MANUALLY
// This allows hosts to request long names for files and folders with M33
//#define LONG_FILENAME_HOST_SUPPORT

4
Marlin/src/inc/SanityCheck.h
View File

@ -327,8 +327,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
* Progress Bar
*/
#if ENABLED(LCD_PROGRESS_BAR)
#if DISABLED(SDSUPPORT)
#error "LCD_PROGRESS_BAR requires SDSUPPORT."
#if DISABLED(SDSUPPORT) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
#error "LCD_PROGRESS_BAR requires SDSUPPORT or LCD_SET_PROGRESS_MANUALLY."
#elif DISABLED(ULTRA_LCD)
#error "LCD_PROGRESS_BAR requires a character LCD."
#elif ENABLED(DOGLCD)

8
Marlin/src/lcd/ultralcd_impl_DOGM.h
View File

@ -580,11 +580,9 @@ static void lcd_implementation_status_screen() {
}
#if ENABLED(SDSUPPORT)
//
// SD Card Symbol
//
if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
// Upper box
u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47)
@ -595,11 +593,12 @@ static void lcd_implementation_status_screen() {
// Corner pixel
u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42)
}
#endif // SDSUPPORT
#if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
//
// Progress bar frame
//
#define PROGRESS_BAR_X 54
#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
@ -650,7 +649,6 @@ static void lcd_implementation_status_screen() {
#endif
if (PAGE_CONTAINS(41, 48)) {
char buffer[10];
duration_t elapsed = print_job_timer.duration();
bool has_days = (elapsed.value >= 60*60*24L);
@ -659,7 +657,7 @@ static void lcd_implementation_status_screen() {
lcd_print(buffer);
}
#endif
#endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
//
// XYZ Coordinates

28
Marlin/src/lcd/ultralcd_impl_HD44780.h
View File

@ -426,23 +426,21 @@ static void lcd_set_custom_characters(
createChar_P(LCD_FEEDRATE_CHAR, feedrate);
createChar_P(LCD_CLOCK_CHAR, clock);
#if ENABLED(SDSUPPORT)
#if ENABLED(LCD_PROGRESS_BAR)
if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen
for (int16_t i = 3; i--;)
createChar_P(LCD_STR_PROGRESS[i], progress[i]);
}
else
#endif
{ // SD Card sub-menu special characters
createChar_P(LCD_UPLEVEL_CHAR, uplevel);
#if ENABLED(LCD_PROGRESS_BAR)
if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen
for (int16_t i = 3; i--;)
createChar_P(LCD_STR_PROGRESS[i], progress[i]);
}
else
#endif
{
createChar_P(LCD_UPLEVEL_CHAR, uplevel);
#if ENABLED(SDSUPPORT)
// SD Card sub-menu special characters
createChar_P(LCD_STR_REFRESH[0], refresh);
createChar_P(LCD_STR_FOLDER[0], folder);
}
#else
// With no SD support, only need the uplevel character
createChar_P(LCD_UPLEVEL_CHAR, uplevel);
#endif
#endif
}
}
}
}