0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-19 08:08:25 +00:00

Merge pull request #9682 from thinkyhead/bf1_m73_without_sd

[1.1.x] Allow M73 without SDSUPPORT
This commit is contained in:
Scott Lahteine 2018-02-17 15:50:19 -06:00 committed by GitHub
commit 8761cb0464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 131 additions and 136 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -518,7 +518,6 @@ static void lcd_implementation_status_screen() {
// entry to the status screen. Nozzle, bed, and // entry to the status screen. Nozzle, bed, and
// fan outline bits don't change. // fan outline bits don't change.
// //
if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) { if (PAGE_UNDER(STATUS_SCREENHEIGHT + 1)) {
u8g.drawBitmapP( u8g.drawBitmapP(
@ -567,11 +566,9 @@ static void lcd_implementation_status_screen() {
} }
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// //
// SD Card Symbol // SD Card Symbol
// //
if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) { if (card.isFileOpen() && PAGE_CONTAINS(42 - (TALL_FONT_CORRECTION), 51 - (TALL_FONT_CORRECTION))) {
// Upper box // Upper box
u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47) u8g.drawBox(42, 42 - (TALL_FONT_CORRECTION), 8, 7); // 42-48 (or 41-47)
@ -582,11 +579,12 @@ static void lcd_implementation_status_screen() {
// Corner pixel // Corner pixel
u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42) u8g.drawPixel(50, 43 - (TALL_FONT_CORRECTION)); // 43 (or 42)
} }
#endif // SDSUPPORT
#if ENABLED(SDSUPPORT) || ENABLED(LCD_SET_PROGRESS_MANUALLY)
// //
// Progress bar frame // Progress bar frame
// //
#define PROGRESS_BAR_X 54 #define PROGRESS_BAR_X 54
#define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X) #define PROGRESS_BAR_WIDTH (LCD_PIXEL_WIDTH - PROGRESS_BAR_X)
@ -637,7 +635,6 @@ static void lcd_implementation_status_screen() {
#endif #endif
if (PAGE_CONTAINS(41, 48)) { if (PAGE_CONTAINS(41, 48)) {
char buffer[10]; char buffer[10];
duration_t elapsed = print_job_timer.duration(); duration_t elapsed = print_job_timer.duration();
bool has_days = (elapsed.value >= 60*60*24L); bool has_days = (elapsed.value >= 60*60*24L);
@ -646,7 +643,7 @@ static void lcd_implementation_status_screen() {
lcd_print(buffer); lcd_print(buffer);
} }
#endif #endif // SDSUPPORT || LCD_SET_PROGRESS_MANUALLY
// //
// XYZ Coordinates // XYZ Coordinates

View file

@ -116,7 +116,7 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
#define B_DW (_BV(BL_DW)) #define B_DW (_BV(BL_DW))
#define B_RI (_BV(BL_RI)) #define B_RI (_BV(BL_RI))
#define B_ST (_BV(BL_ST)) #define B_ST (_BV(BL_ST))
#define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST)) #define LCD_CLICKED (buttons & (B_MI|B_ST))
#endif #endif
#endif // ULTIPANEL #endif // ULTIPANEL
@ -421,7 +421,6 @@ static void lcd_set_custom_characters(
createChar_P(LCD_FEEDRATE_CHAR, feedrate); createChar_P(LCD_FEEDRATE_CHAR, feedrate);
createChar_P(LCD_CLOCK_CHAR, clock); createChar_P(LCD_CLOCK_CHAR, clock);
#if ENABLED(SDSUPPORT)
#if ENABLED(LCD_PROGRESS_BAR) #if ENABLED(LCD_PROGRESS_BAR)
if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen if (screen_charset == CHARSET_INFO) { // 3 Progress bar characters for info screen
for (int16_t i = 3; i--;) for (int16_t i = 3; i--;)
@ -429,17 +428,16 @@ static void lcd_set_custom_characters(
} }
else else
#endif #endif
{ // SD Card sub-menu special characters {
createChar_P(LCD_UPLEVEL_CHAR, uplevel); 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_REFRESH[0], refresh);
createChar_P(LCD_STR_FOLDER[0], folder); 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
} }
} }
}
} }
static void lcd_implementation_init( static void lcd_implementation_init(
@ -799,7 +797,7 @@ static void lcd_implementation_status_screen() {
lcd.setCursor(0, 1); lcd.setCursor(0, 1);
// If the first line has two extruder temps, // If the first line has two extruder temps,
// show more temperatures on the next line. // show more temperatures on the next line
#if HOTENDS > 2 || (HOTENDS > 1 && TEMP_SENSOR_BED) #if HOTENDS > 2 || (HOTENDS > 1 && TEMP_SENSOR_BED)
@ -1323,18 +1321,18 @@ static void lcd_implementation_status_screen() {
} }
clear_custom_char(&new_char); clear_custom_char(&new_char);
new_char.custom_char_bits[0] = 0B11111U; // char #0 is used for the top line of the box new_char.custom_char_bits[0] = 0b11111U; // char #0 is used for the top line of the box
lcd.createChar(0, (uint8_t*)&new_char); lcd.createChar(0, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);
k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1; // row of pixels for the bottom box line k = (GRID_MAX_POINTS_Y) * pixels_per_y_mesh_pnt + 1; // row of pixels for the bottom box line
l = k % (ULTRA_Y_PIXELS_PER_CHAR); // row within relevant character cell l = k % (ULTRA_Y_PIXELS_PER_CHAR); // row within relevant character cell
new_char.custom_char_bits[l] = 0B11111U; // char #1 is used for the bottom line of the box new_char.custom_char_bits[l] = 0b11111U; // char #1 is used for the bottom line of the box
lcd.createChar(1, (uint8_t*)&new_char); lcd.createChar(1, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);
for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++) for (j = 0; j < ULTRA_Y_PIXELS_PER_CHAR; j++)
new_char.custom_char_bits[j] = 0B10000U; // char #2 is used for the left edge of the box new_char.custom_char_bits[j] = 0b10000U; // char #2 is used for the left edge of the box
lcd.createChar(2, (uint8_t*)&new_char); lcd.createChar(2, (uint8_t*)&new_char);
clear_custom_char(&new_char); clear_custom_char(&new_char);