Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config

Make LCD_TIMEOUT_TO_STATUS configurable
8 years ago · 05b217c0d0
parent 493e738575 c759c26cca
commit 05b217c0d0
3 changed files with 8 additions and 1 deletions
--- a/Marlin/Conditionals_post.h
+++ b/Marlin/Conditionals_post.h
@ -726,4 +726,9 @@
    #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
  #endif

+  // LCD timeout to status screen default is 15s
+  #ifndef LCD_TIMEOUT_TO_STATUS
+    #define LCD_TIMEOUT_TO_STATUS 15000
+  #endif
+
 #endif // CONDITIONALS_POST_H
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@ -425,6 +425,9 @@
 // On the Info Screen, display XY with one decimal place when possible
 //#define LCD_DECIMAL_SMALL_XY

+// The timeout (in ms) to return to the status screen from sub-menus
+//#define LCD_TIMEOUT_TO_STATUS 15000
+
 #if ENABLED(SDSUPPORT)

  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@ -65,7 +65,6 @@
  #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))

  #define LCD_UPDATE_INTERVAL 100
-  #define LCD_TIMEOUT_TO_STATUS 15000

  #if ENABLED(ULTIPANEL)