Explorar el Código

Merge pull request #5930 from thinkyhead/rc_lcd_timeout_config

Make LCD_TIMEOUT_TO_STATUS configurable
Scott Lahteine hace 7 años
padre
commit
05b217c0d0
Se han modificado 3 ficheros con 8 adiciones y 1 borrados
  1. 5
    0
      Marlin/Conditionals_post.h
  2. 3
    0
      Marlin/Configuration_adv.h
  3. 0
    1
      Marlin/ultralcd.h

+ 5
- 0
Marlin/Conditionals_post.h Ver fichero

@@ -726,4 +726,9 @@
726 726
     #define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
727 727
   #endif
728 728
 
729
+  // LCD timeout to status screen default is 15s
730
+  #ifndef LCD_TIMEOUT_TO_STATUS
731
+    #define LCD_TIMEOUT_TO_STATUS 15000
732
+  #endif
733
+
729 734
 #endif // CONDITIONALS_POST_H

+ 3
- 0
Marlin/Configuration_adv.h Ver fichero

@@ -425,6 +425,9 @@
425 425
 // On the Info Screen, display XY with one decimal place when possible
426 426
 //#define LCD_DECIMAL_SMALL_XY
427 427
 
428
+// The timeout (in ms) to return to the status screen from sub-menus
429
+//#define LCD_TIMEOUT_TO_STATUS 15000
430
+
428 431
 #if ENABLED(SDSUPPORT)
429 432
 
430 433
   // Some RAMPS and other boards don't detect when an SD card is inserted. You can work

+ 0
- 1
Marlin/ultralcd.h Ver fichero

@@ -65,7 +65,6 @@
65 65
   #define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
66 66
 
67 67
   #define LCD_UPDATE_INTERVAL 100
68
-  #define LCD_TIMEOUT_TO_STATUS 15000
69 68
 
70 69
   #if ENABLED(ULTIPANEL)
71 70
 

Loading…
Cancelar
Guardar